diff --git a/drift_schemas/twonly_database/drift_schema_v15.json b/drift_schemas/twonly_database/drift_schema_v15.json new file mode 100644 index 0000000..f76a649 --- /dev/null +++ b/drift_schemas/twonly_database/drift_schema_v15.json @@ -0,0 +1 @@ +{"_meta":{"description":"This file contains a serialized version of schema entities for drift.","version":"1.2.0"},"options":{"store_date_time_values_as_text":false},"entities":[{"id":0,"references":[],"type":"table","data":{"name":"contacts","was_declared_in_moor":false,"columns":[{"name":"user_id","getter_name":"userId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"username","getter_name":"username","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"UNIQUE","dialectAwareDefaultConstraints":{"sqlite":"UNIQUE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unique"]},{"name":"display_name","getter_name":"displayName","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"nick_name","getter_name":"nickName","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"avatar_svg","getter_name":"avatarSvg","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"my_avatar_counter","getter_name":"myAvatarCounter","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"accepted","getter_name":"accepted","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"accepted\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"accepted\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"requested","getter_name":"requested","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"requested\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"requested\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"blocked","getter_name":"blocked","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"blocked\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"blocked\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"verified","getter_name":"verified","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"verified\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"verified\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"archived","getter_name":"archived","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"archived\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"archived\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"pinned","getter_name":"pinned","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"pinned\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"pinned\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"deleted","getter_name":"deleted","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"deleted\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"deleted\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"also_best_friend","getter_name":"alsoBestFriend","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"also_best_friend\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"also_best_friend\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"delete_messages_after_x_minutes","getter_name":"deleteMessagesAfterXMinutes","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('1440')","default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]},{"name":"total_media_counter","getter_name":"totalMediaCounter","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"last_message_send","getter_name":"lastMessageSend","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"last_message_received","getter_name":"lastMessageReceived","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"last_flame_counter_change","getter_name":"lastFlameCounterChange","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"last_flame_sync","getter_name":"lastFlameSync","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"last_message_exchange","getter_name":"lastMessageExchange","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]},{"name":"flame_counter","getter_name":"flameCounter","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["user_id"]}},{"id":1,"references":[0],"type":"table","data":{"name":"messages","was_declared_in_moor":false,"columns":[{"name":"contact_id","getter_name":"contactId","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES contacts (user_id)","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES contacts (user_id)"},"default_dart":null,"default_client_dart":null,"dsl_features":[{"foreign_key":{"to":{"table":"contacts","column":"user_id"},"initially_deferred":false,"on_update":null,"on_delete":null}}]},{"name":"message_id","getter_name":"messageId","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"PRIMARY KEY AUTOINCREMENT","dialectAwareDefaultConstraints":{"sqlite":"PRIMARY KEY AUTOINCREMENT"},"default_dart":null,"default_client_dart":null,"dsl_features":["auto-increment"]},{"name":"message_other_id","getter_name":"messageOtherId","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"media_upload_id","getter_name":"mediaUploadId","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"media_download_id","getter_name":"mediaDownloadId","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"response_to_message_id","getter_name":"responseToMessageId","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"response_to_other_message_id","getter_name":"responseToOtherMessageId","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"acknowledge_by_user","getter_name":"acknowledgeByUser","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"acknowledge_by_user\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"acknowledge_by_user\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"media_stored","getter_name":"mediaStored","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"media_stored\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"media_stored\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"download_state","getter_name":"downloadState","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('2')","default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter(DownloadState.values)","dart_type_name":"DownloadState"}},{"name":"acknowledge_by_server","getter_name":"acknowledgeByServer","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"acknowledge_by_server\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"acknowledge_by_server\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"error_while_sending","getter_name":"errorWhileSending","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"error_while_sending\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"error_while_sending\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"media_retransmission_state","getter_name":"mediaRetransmissionState","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('\\'none\\'')","default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumNameConverter(MediaRetransmitting.values)","dart_type_name":"MediaRetransmitting"}},{"name":"kind","getter_name":"kind","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumNameConverter(MessageKind.values)","dart_type_name":"MessageKind"}},{"name":"content_json","getter_name":"contentJson","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"opened_at","getter_name":"openedAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"send_at","getter_name":"sendAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[]}},{"id":2,"references":[],"type":"table","data":{"name":"media_uploads","was_declared_in_moor":false,"columns":[{"name":"media_upload_id","getter_name":"mediaUploadId","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"PRIMARY KEY AUTOINCREMENT","dialectAwareDefaultConstraints":{"sqlite":"PRIMARY KEY AUTOINCREMENT"},"default_dart":null,"default_client_dart":null,"dsl_features":["auto-increment"]},{"name":"state","getter_name":"state","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('\\'pending\\'')","default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumNameConverter(UploadState.values)","dart_type_name":"UploadState"}},{"name":"metadata","getter_name":"metadata","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"MediaUploadMetadataConverter()","dart_type_name":"MediaUploadMetadata"}},{"name":"message_ids","getter_name":"messageIds","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"IntListTypeConverter()","dart_type_name":"List"}},{"name":"encryption_data","getter_name":"encryptionData","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"MediaEncryptionDataConverter()","dart_type_name":"MediaEncryptionData"}}],"is_virtual":false,"without_rowid":false,"constraints":[]}},{"id":3,"references":[],"type":"table","data":{"name":"media_downloads","was_declared_in_moor":false,"columns":[{"name":"message_id","getter_name":"messageId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"download_token","getter_name":"downloadToken","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"IntListTypeConverter()","dart_type_name":"List"}}],"is_virtual":false,"without_rowid":false,"constraints":[]}},{"id":4,"references":[],"type":"table","data":{"name":"signal_identity_key_stores","was_declared_in_moor":false,"columns":[{"name":"device_id","getter_name":"deviceId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"identity_key","getter_name":"identityKey","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["device_id","name"]}},{"id":5,"references":[],"type":"table","data":{"name":"signal_pre_key_stores","was_declared_in_moor":false,"columns":[{"name":"pre_key_id","getter_name":"preKeyId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"pre_key","getter_name":"preKey","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["pre_key_id"]}},{"id":6,"references":[],"type":"table","data":{"name":"signal_sender_key_stores","was_declared_in_moor":false,"columns":[{"name":"sender_key_name","getter_name":"senderKeyName","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"sender_key","getter_name":"senderKey","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["sender_key_name"]}},{"id":7,"references":[],"type":"table","data":{"name":"signal_session_stores","was_declared_in_moor":false,"columns":[{"name":"device_id","getter_name":"deviceId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"session_record","getter_name":"sessionRecord","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["device_id","name"]}},{"id":8,"references":[],"type":"table","data":{"name":"signal_contact_pre_keys","was_declared_in_moor":false,"columns":[{"name":"contact_id","getter_name":"contactId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"pre_key_id","getter_name":"preKeyId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"pre_key","getter_name":"preKey","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["contact_id","pre_key_id"]}},{"id":9,"references":[],"type":"table","data":{"name":"signal_contact_signed_pre_keys","was_declared_in_moor":false,"columns":[{"name":"contact_id","getter_name":"contactId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"signed_pre_key_id","getter_name":"signedPreKeyId","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"signed_pre_key","getter_name":"signedPreKey","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"signed_pre_key_signature","getter_name":"signedPreKeySignature","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[],"explicit_pk":["contact_id"]}},{"id":10,"references":[0,1],"type":"table","data":{"name":"message_retransmissions","was_declared_in_moor":false,"columns":[{"name":"retransmission_id","getter_name":"retransmissionId","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"PRIMARY KEY AUTOINCREMENT","dialectAwareDefaultConstraints":{"sqlite":"PRIMARY KEY AUTOINCREMENT"},"default_dart":null,"default_client_dart":null,"dsl_features":["auto-increment"]},{"name":"contact_id","getter_name":"contactId","moor_type":"int","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES contacts (user_id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES contacts (user_id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":[{"foreign_key":{"to":{"table":"contacts","column":"user_id"},"initially_deferred":false,"on_update":null,"on_delete":"cascade"}}]},{"name":"message_id","getter_name":"messageId","moor_type":"int","nullable":true,"customConstraints":null,"defaultConstraints":"REFERENCES messages (message_id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES messages (message_id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":[{"foreign_key":{"to":{"table":"messages","column":"message_id"},"initially_deferred":false,"on_update":null,"on_delete":"cascade"}}]},{"name":"plaintext_content","getter_name":"plaintextContent","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"push_data","getter_name":"pushData","moor_type":"blob","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"encrypted_hash","getter_name":"encryptedHash","moor_type":"blob","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"acknowledge_by_server_at","getter_name":"acknowledgeByServerAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":false,"constraints":[]}}]} \ No newline at end of file diff --git a/lib/src/database/daos/messages_dao.dart b/lib/src/database/daos/messages_dao.dart index 813ce5b..5ed6372 100644 --- a/lib/src/database/daos/messages_dao.dart +++ b/lib/src/database/daos/messages_dao.dart @@ -210,6 +210,15 @@ class MessagesDao extends DatabaseAccessor .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(); } diff --git a/lib/src/database/tables/media_uploads_table.dart b/lib/src/database/tables/media_uploads_table.dart index d4ca964..5e13ef5 100644 --- a/lib/src/database/tables/media_uploads_table.dart +++ b/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 uploadToken; - late List> downloadTokens; - - MediaUploadTokens(); - - Map toJson() { - return { - 'uploadToken': uploadToken, - 'downloadTokens': downloadTokens, - }; - } - - factory MediaUploadTokens.fromJson(Map json) { - MediaUploadTokens state = MediaUploadTokens(); - state.uploadToken = List.from(json['uploadToken']); - state.downloadTokens = List>.from( - json['downloadTokens'].map((token) => List.from(token)), - ); - return state; - } -} - // --- converters ---- class IntListTypeConverter extends TypeConverter, String> { @@ -193,29 +153,3 @@ class MediaEncryptionDataConverter return value.toJson(); } } - -class MediaUploadTokensConverter - extends TypeConverter - with JsonTypeConverter2> { - const MediaUploadTokensConverter(); - - @override - MediaUploadTokens fromSql(String fromDb) { - return fromJson(json.decode(fromDb) as Map); - } - - @override - String toSql(MediaUploadTokens value) { - return json.encode(toJson(value)); - } - - @override - MediaUploadTokens fromJson(Map json) { - return MediaUploadTokens.fromJson(json); - } - - @override - Map toJson(MediaUploadTokens value) { - return value.toJson(); - } -} diff --git a/lib/src/database/tables/messages_table.dart b/lib/src/database/tables/messages_table.dart index 0642130..4ec3987 100644 --- a/lib/src/database/tables/messages_table.dart +++ b/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() + .withDefault(Constant(MediaRetransmitting.none.name))(); TextColumn get kind => textEnum()(); TextColumn get contentJson => text().nullable()(); diff --git a/lib/src/database/twonly_database.dart b/lib/src/database/twonly_database.dart index 44418f8..266d0f9 100644 --- a/lib/src/database/twonly_database.dart +++ b/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(signalContactSignedPreKeys); + m.createTable(schema.signalContactPreKeys); + 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); + }, ), ); } diff --git a/lib/src/database/twonly_database.g.dart b/lib/src/database/twonly_database.g.dart index 1befb6b..bbeb9c9 100644 --- a/lib/src/database/twonly_database.g.dart +++ b/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 + mediaRetransmissionState = GeneratedColumn( + 'media_retransmission_state', aliasedName, false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: Constant(MediaRetransmitting.none.name)) + .withConverter( + $MessagesTable.$convertermediaRetransmissionState); + @override late final GeneratedColumnWithTypeConverter kind = GeneratedColumn('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 $converterdownloadState = const EnumIndexConverter(DownloadState.values); + static JsonTypeConverter2 + $convertermediaRetransmissionState = + const EnumNameConverter(MediaRetransmitting.values); static JsonTypeConverter2 $converterkind = const EnumNameConverter(MessageKind.values); } @@ -1415,6 +1432,7 @@ class Message extends DataClass implements Insertable { 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 { 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 { } map['acknowledge_by_server'] = Variable(acknowledgeByServer); map['error_while_sending'] = Variable(errorWhileSending); + { + map['media_retransmission_state'] = Variable($MessagesTable + .$convertermediaRetransmissionState + .toSql(mediaRetransmissionState)); + } { map['kind'] = Variable($MessagesTable.$converterkind.toSql(kind)); } @@ -1505,6 +1529,7 @@ class Message extends DataClass implements Insertable { 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 { acknowledgeByServer: serializer.fromJson(json['acknowledgeByServer']), errorWhileSending: serializer.fromJson(json['errorWhileSending']), + mediaRetransmissionState: + $MessagesTable.$convertermediaRetransmissionState.fromJson( + serializer.fromJson(json['mediaRetransmissionState'])), kind: $MessagesTable.$converterkind .fromJson(serializer.fromJson(json['kind'])), contentJson: serializer.fromJson(json['contentJson']), @@ -1563,6 +1591,9 @@ class Message extends DataClass implements Insertable { $MessagesTable.$converterdownloadState.toJson(downloadState)), 'acknowledgeByServer': serializer.toJson(acknowledgeByServer), 'errorWhileSending': serializer.toJson(errorWhileSending), + 'mediaRetransmissionState': serializer.toJson($MessagesTable + .$convertermediaRetransmissionState + .toJson(mediaRetransmissionState)), 'kind': serializer.toJson($MessagesTable.$converterkind.toJson(kind)), 'contentJson': serializer.toJson(contentJson), @@ -1585,6 +1616,7 @@ class Message extends DataClass implements Insertable { DownloadState? downloadState, bool? acknowledgeByServer, bool? errorWhileSending, + MediaRetransmitting? mediaRetransmissionState, MessageKind? kind, Value contentJson = const Value.absent(), Value openedAt = const Value.absent(), @@ -1611,6 +1643,8 @@ class Message extends DataClass implements Insertable { 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 { 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 { ..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 { downloadState, acknowledgeByServer, errorWhileSending, + mediaRetransmissionState, kind, contentJson, openedAt, @@ -1718,6 +1757,7 @@ class Message extends DataClass implements Insertable { 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 { final Value downloadState; final Value acknowledgeByServer; final Value errorWhileSending; + final Value mediaRetransmissionState; final Value kind; final Value contentJson; final Value openedAt; @@ -1756,6 +1797,7 @@ class MessagesCompanion extends UpdateCompanion { 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 { 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 { Expression? downloadState, Expression? acknowledgeByServer, Expression? errorWhileSending, + Expression? mediaRetransmissionState, Expression? kind, Expression? contentJson, Expression? openedAt, @@ -1817,6 +1861,8 @@ class MessagesCompanion extends UpdateCompanion { 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 { Value? downloadState, Value? acknowledgeByServer, Value? errorWhileSending, + Value? mediaRetransmissionState, Value? kind, Value? contentJson, Value? openedAt, @@ -1857,6 +1904,8 @@ class MessagesCompanion extends UpdateCompanion { 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 { if (errorWhileSending.present) { map['error_while_sending'] = Variable(errorWhileSending.value); } + if (mediaRetransmissionState.present) { + map['media_retransmission_state'] = Variable($MessagesTable + .$convertermediaRetransmissionState + .toSql(mediaRetransmissionState.value)); + } if (kind.present) { map['kind'] = Variable($MessagesTable.$converterkind.toSql(kind.value)); @@ -1940,6 +1994,7 @@ class MessagesCompanion extends UpdateCompanion { ..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( $MediaUploadsTable.$converterencryptionDatan); @override - late final GeneratedColumnWithTypeConverter - uploadTokens = GeneratedColumn('upload_tokens', aliasedName, true, - type: DriftSqlType.string, requiredDuringInsert: false) - .withConverter( - $MediaUploadsTable.$converteruploadTokensn); - @override - late final GeneratedColumnWithTypeConverter, String> - alreadyNotified = GeneratedColumn( - 'already_notified', aliasedName, false, - type: DriftSqlType.string, - requiredDuringInsert: false, - defaultValue: Constant("[]")) - .withConverter>( - $MediaUploadsTable.$converteralreadyNotified); - @override - List get $columns => [ - mediaUploadId, - state, - metadata, - messageIds, - encryptionData, - uploadTokens, - alreadyNotified - ]; + List get $columns => + [mediaUploadId, state, metadata, messageIds, encryptionData]; @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?> $converterencryptionDatan = JsonTypeConverter2.asNullable($converterencryptionData); - static JsonTypeConverter2> - $converteruploadTokens = MediaUploadTokensConverter(); - static JsonTypeConverter2?> - $converteruploadTokensn = - JsonTypeConverter2.asNullable($converteruploadTokens); - static TypeConverter, String> $converteralreadyNotified = - IntListTypeConverter(); } class MediaUpload extends DataClass implements Insertable { @@ -2101,23 +2121,13 @@ class MediaUpload extends DataClass implements Insertable { /// exists in UploadState.addedToMessagesDb final List? messageIds; - - /// exsists in UploadState.isEncrypted final MediaEncryptionData? encryptionData; - - /// exsists in UploadState.hasUploadToken - final MediaUploadTokens? uploadTokens; - - /// exists in UploadState.addedToMessagesDb - final List alreadyNotified; const MediaUpload( {required this.mediaUploadId, required this.state, this.metadata, this.messageIds, - this.encryptionData, - this.uploadTokens, - required this.alreadyNotified}); + this.encryptionData}); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -2138,14 +2148,6 @@ class MediaUpload extends DataClass implements Insertable { map['encryption_data'] = Variable( $MediaUploadsTable.$converterencryptionDatan.toSql(encryptionData)); } - if (!nullToAbsent || uploadTokens != null) { - map['upload_tokens'] = Variable( - $MediaUploadsTable.$converteruploadTokensn.toSql(uploadTokens)); - } - { - map['already_notified'] = Variable( - $MediaUploadsTable.$converteralreadyNotified.toSql(alreadyNotified)); - } return map; } @@ -2162,10 +2164,6 @@ class MediaUpload extends DataClass implements Insertable { 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 { messageIds: serializer.fromJson?>(json['messageIds']), encryptionData: $MediaUploadsTable.$converterencryptionDatan.fromJson( serializer.fromJson?>(json['encryptionData'])), - uploadTokens: $MediaUploadsTable.$converteruploadTokensn.fromJson( - serializer.fromJson?>(json['uploadTokens'])), - alreadyNotified: serializer.fromJson>(json['alreadyNotified']), ); } @override @@ -2198,9 +2193,6 @@ class MediaUpload extends DataClass implements Insertable { 'messageIds': serializer.toJson?>(messageIds), 'encryptionData': serializer.toJson?>( $MediaUploadsTable.$converterencryptionDatan.toJson(encryptionData)), - 'uploadTokens': serializer.toJson?>( - $MediaUploadsTable.$converteruploadTokensn.toJson(uploadTokens)), - 'alreadyNotified': serializer.toJson>(alreadyNotified), }; } @@ -2209,9 +2201,7 @@ class MediaUpload extends DataClass implements Insertable { UploadState? state, Value metadata = const Value.absent(), Value?> messageIds = const Value.absent(), - Value encryptionData = const Value.absent(), - Value uploadTokens = const Value.absent(), - List? alreadyNotified}) => + Value encryptionData = const Value.absent()}) => MediaUpload( mediaUploadId: mediaUploadId ?? this.mediaUploadId, state: state ?? this.state, @@ -2219,9 +2209,6 @@ class MediaUpload extends DataClass implements Insertable { 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 { 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 { ..write('state: $state, ') ..write('metadata: $metadata, ') ..write('messageIds: $messageIds, ') - ..write('encryptionData: $encryptionData, ') - ..write('uploadTokens: $uploadTokens, ') - ..write('alreadyNotified: $alreadyNotified') + ..write('encryptionData: $encryptionData') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(mediaUploadId, state, metadata, messageIds, - encryptionData, uploadTokens, alreadyNotified); + int get hashCode => + 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 { other.state == this.state && other.metadata == this.metadata && other.messageIds == this.messageIds && - other.encryptionData == this.encryptionData && - other.uploadTokens == this.uploadTokens && - other.alreadyNotified == this.alreadyNotified); + other.encryptionData == this.encryptionData); } class MediaUploadsCompanion extends UpdateCompanion { @@ -2280,16 +2257,12 @@ class MediaUploadsCompanion extends UpdateCompanion { final Value metadata; final Value?> messageIds; final Value encryptionData; - final Value uploadTokens; - final Value> 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 { 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 custom({ Expression? mediaUploadId, @@ -2306,8 +2277,6 @@ class MediaUploadsCompanion extends UpdateCompanion { Expression? metadata, Expression? messageIds, Expression? encryptionData, - Expression? uploadTokens, - Expression? alreadyNotified, }) { return RawValuesInsertable({ if (mediaUploadId != null) 'media_upload_id': mediaUploadId, @@ -2315,8 +2284,6 @@ class MediaUploadsCompanion extends UpdateCompanion { 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 { Value? state, Value? metadata, Value?>? messageIds, - Value? encryptionData, - Value? uploadTokens, - Value>? alreadyNotified}) { + Value? encryptionData}) { 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 { .$converterencryptionDatan .toSql(encryptionData.value)); } - if (uploadTokens.present) { - map['upload_tokens'] = Variable( - $MediaUploadsTable.$converteruploadTokensn.toSql(uploadTokens.value)); - } - if (alreadyNotified.present) { - map['already_notified'] = Variable($MediaUploadsTable - .$converteralreadyNotified - .toSql(alreadyNotified.value)); - } return map; } @@ -2381,9 +2335,7 @@ class MediaUploadsCompanion extends UpdateCompanion { ..write('state: $state, ') ..write('metadata: $metadata, ') ..write('messageIds: $messageIds, ') - ..write('encryptionData: $encryptionData, ') - ..write('uploadTokens: $uploadTokens, ') - ..write('alreadyNotified: $alreadyNotified') + ..write('encryptionData: $encryptionData') ..write(')')) .toString(); } @@ -5308,6 +5260,7 @@ typedef $$MessagesTableCreateCompanionBuilder = MessagesCompanion Function({ Value downloadState, Value acknowledgeByServer, Value errorWhileSending, + Value mediaRetransmissionState, required MessageKind kind, Value contentJson, Value openedAt, @@ -5327,6 +5280,7 @@ typedef $$MessagesTableUpdateCompanionBuilder = MessagesCompanion Function({ Value downloadState, Value acknowledgeByServer, Value errorWhileSending, + Value mediaRetransmissionState, Value kind, Value contentJson, Value openedAt, @@ -5425,6 +5379,12 @@ class $$MessagesTableFilterComposer column: $table.errorWhileSending, builder: (column) => ColumnFilters(column)); + ColumnWithTypeConverterFilters + get mediaRetransmissionState => $composableBuilder( + column: $table.mediaRetransmissionState, + builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnWithTypeConverterFilters get kind => $composableBuilder( column: $table.kind, @@ -5537,6 +5497,10 @@ class $$MessagesTableOrderingComposer column: $table.errorWhileSending, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get mediaRetransmissionState => $composableBuilder( + column: $table.mediaRetransmissionState, + builder: (column) => ColumnOrderings(column)); + ColumnOrderings get kind => $composableBuilder( column: $table.kind, builder: (column) => ColumnOrderings(column)); @@ -5616,6 +5580,10 @@ class $$MessagesTableAnnotationComposer GeneratedColumn get errorWhileSending => $composableBuilder( column: $table.errorWhileSending, builder: (column) => column); + GeneratedColumnWithTypeConverter + get mediaRetransmissionState => $composableBuilder( + column: $table.mediaRetransmissionState, builder: (column) => column); + GeneratedColumnWithTypeConverter get kind => $composableBuilder(column: $table.kind, builder: (column) => column); @@ -5710,6 +5678,8 @@ class $$MessagesTableTableManager extends RootTableManager< Value downloadState = const Value.absent(), Value acknowledgeByServer = const Value.absent(), Value errorWhileSending = const Value.absent(), + Value mediaRetransmissionState = + const Value.absent(), Value kind = const Value.absent(), Value contentJson = const Value.absent(), Value 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 = const Value.absent(), Value acknowledgeByServer = const Value.absent(), Value errorWhileSending = const Value.absent(), + Value mediaRetransmissionState = + const Value.absent(), required MessageKind kind, Value contentJson = const Value.absent(), Value 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 metadata, Value?> messageIds, Value encryptionData, - Value uploadTokens, - Value> alreadyNotified, }); typedef $$MediaUploadsTableUpdateCompanionBuilder = MediaUploadsCompanion Function({ @@ -5861,8 +5833,6 @@ typedef $$MediaUploadsTableUpdateCompanionBuilder = MediaUploadsCompanion Value metadata, Value?> messageIds, Value encryptionData, - Value uploadTokens, - Value> alreadyNotified, }); class $$MediaUploadsTableFilterComposer @@ -5898,16 +5868,6 @@ class $$MediaUploadsTableFilterComposer get encryptionData => $composableBuilder( column: $table.encryptionData, builder: (column) => ColumnWithTypeConverterFilters(column)); - - ColumnWithTypeConverterFilters - get uploadTokens => $composableBuilder( - column: $table.uploadTokens, - builder: (column) => ColumnWithTypeConverterFilters(column)); - - ColumnWithTypeConverterFilters, List, String> - get alreadyNotified => $composableBuilder( - column: $table.alreadyNotified, - builder: (column) => ColumnWithTypeConverterFilters(column)); } class $$MediaUploadsTableOrderingComposer @@ -5935,14 +5895,6 @@ class $$MediaUploadsTableOrderingComposer ColumnOrderings get encryptionData => $composableBuilder( column: $table.encryptionData, builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get uploadTokens => $composableBuilder( - column: $table.uploadTokens, - builder: (column) => ColumnOrderings(column)); - - ColumnOrderings get alreadyNotified => $composableBuilder( - column: $table.alreadyNotified, - builder: (column) => ColumnOrderings(column)); } class $$MediaUploadsTableAnnotationComposer @@ -5970,14 +5922,6 @@ class $$MediaUploadsTableAnnotationComposer GeneratedColumnWithTypeConverter get encryptionData => $composableBuilder( column: $table.encryptionData, builder: (column) => column); - - GeneratedColumnWithTypeConverter - get uploadTokens => $composableBuilder( - column: $table.uploadTokens, builder: (column) => column); - - GeneratedColumnWithTypeConverter, String> get alreadyNotified => - $composableBuilder( - column: $table.alreadyNotified, builder: (column) => column); } class $$MediaUploadsTableTableManager extends RootTableManager< @@ -6011,8 +5955,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager< Value metadata = const Value.absent(), Value?> messageIds = const Value.absent(), Value encryptionData = const Value.absent(), - Value uploadTokens = const Value.absent(), - Value> 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 mediaUploadId = const Value.absent(), @@ -6029,8 +5969,6 @@ class $$MediaUploadsTableTableManager extends RootTableManager< Value metadata = const Value.absent(), Value?> messageIds = const Value.absent(), Value encryptionData = const Value.absent(), - Value uploadTokens = const Value.absent(), - Value> 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))) diff --git a/lib/src/database/twonly_database.steps.dart b/lib/src/database/twonly_database.steps.dart index 4aacfb6..7272759 100644 --- a/lib/src/database/twonly_database.steps.dart +++ b/lib/src/database/twonly_database.steps.dart @@ -3206,6 +3206,297 @@ class Shape18 extends i0.VersionedTable { i1.GeneratedColumn _column_69(String aliasedName) => i1.GeneratedColumn('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 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 get contactId => + columnsByName['contact_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get messageId => + columnsByName['message_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get messageOtherId => + columnsByName['message_other_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get mediaUploadId => + columnsByName['media_upload_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get mediaDownloadId => + columnsByName['media_download_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get responseToMessageId => + columnsByName['response_to_message_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get responseToOtherMessageId => + columnsByName['response_to_other_message_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get acknowledgeByUser => + columnsByName['acknowledge_by_user']! as i1.GeneratedColumn; + i1.GeneratedColumn get mediaStored => + columnsByName['media_stored']! as i1.GeneratedColumn; + i1.GeneratedColumn get downloadState => + columnsByName['download_state']! as i1.GeneratedColumn; + i1.GeneratedColumn get acknowledgeByServer => + columnsByName['acknowledge_by_server']! as i1.GeneratedColumn; + i1.GeneratedColumn get errorWhileSending => + columnsByName['error_while_sending']! as i1.GeneratedColumn; + i1.GeneratedColumn get mediaRetransmissionState => + columnsByName['media_retransmission_state']! + as i1.GeneratedColumn; + i1.GeneratedColumn get kind => + columnsByName['kind']! as i1.GeneratedColumn; + i1.GeneratedColumn get contentJson => + columnsByName['content_json']! as i1.GeneratedColumn; + i1.GeneratedColumn get openedAt => + columnsByName['opened_at']! as i1.GeneratedColumn; + i1.GeneratedColumn get sendAt => + columnsByName['send_at']! as i1.GeneratedColumn; + i1.GeneratedColumn get updatedAt => + columnsByName['updated_at']! as i1.GeneratedColumn; +} + +i1.GeneratedColumn _column_70(String aliasedName) => + i1.GeneratedColumn('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 get mediaUploadId => + columnsByName['media_upload_id']! as i1.GeneratedColumn; + i1.GeneratedColumn get state => + columnsByName['state']! as i1.GeneratedColumn; + i1.GeneratedColumn get metadata => + columnsByName['metadata']! as i1.GeneratedColumn; + i1.GeneratedColumn get messageIds => + columnsByName['message_ids']! as i1.GeneratedColumn; + i1.GeneratedColumn get encryptionData => + columnsByName['encryption_data']! as i1.GeneratedColumn; +} + i0.MigrationStepWithVersion migrationSteps({ required Future Function(i1.Migrator m, Schema2 schema) from1To2, required Future Function(i1.Migrator m, Schema3 schema) from2To3, @@ -3220,6 +3511,7 @@ i0.MigrationStepWithVersion migrationSteps({ required Future Function(i1.Migrator m, Schema12 schema) from11To12, required Future Function(i1.Migrator m, Schema13 schema) from12To13, required Future Function(i1.Migrator m, Schema14 schema) from13To14, + required Future 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 Function(i1.Migrator m, Schema12 schema) from11To12, required Future Function(i1.Migrator m, Schema13 schema) from12To13, required Future Function(i1.Migrator m, Schema14 schema) from13To14, + required Future 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, )); diff --git a/lib/src/localization/app_de.arb b/lib/src/localization/app_de.arb index 49ba0a7..1e05221 100644 --- a/lib/src/localization/app_de.arb +++ b/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." } \ No newline at end of file diff --git a/lib/src/localization/app_en.arb b/lib/src/localization/app_en.arb index ef55dd8..c38fe9f 100644 --- a/lib/src/localization/app_en.arb +++ b/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" } \ No newline at end of file diff --git a/lib/src/localization/generated/app_localizations.dart b/lib/src/localization/generated/app_localizations.dart index 1b01f30..f3979ea 100644 --- a/lib/src/localization/generated/app_localizations.dart +++ b/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 diff --git a/lib/src/localization/generated/app_localizations_de.dart b/lib/src/localization/generated/app_localizations_de.dart index 18e7f5b..20dbcbd 100644 --- a/lib/src/localization/generated/app_localizations_de.dart +++ b/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.'; } diff --git a/lib/src/localization/generated/app_localizations_en.dart b/lib/src/localization/generated/app_localizations_en.dart index 007ba96..d4d4d06 100644 --- a/lib/src/localization/generated/app_localizations_en.dart +++ b/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'; } diff --git a/lib/src/model/json/message.dart b/lib/src/model/json/message.dart index c3a1f91..b620b48 100644 --- a/lib/src/model/json/message.dart +++ b/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), @@ -69,7 +72,8 @@ class MessageJson { Map toJson() => { '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}); diff --git a/lib/src/services/api/media_download.dart b/lib/src/services/api/media_download.dart index f27ed1e..381be5c 100644 --- a/lib/src/services/api/media_download.dart +++ b/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 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( - "could not decrypt the media file in the second try. reporting error to user: $e"); - handleMediaError(msg); - return; + Log.error("$e"); + + /// legacy support + 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 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 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; diff --git a/lib/src/services/api/media_upload.dart b/lib/src/services/api/media_upload.dart index 17c479c..4e6b60e 100644 --- a/lib/src/services/api/media_upload.dart +++ b/lib/src/services/api/media_upload.dart @@ -517,17 +517,30 @@ Future handleMediaUpload(MediaUpload media) async { if (media.messageIds == null) return; - List downloadTokens = - createDownloadTokens(media.messageIds!.length); + List messageIds = media.messageIds!; + + List downloadTokens = []; List 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.generate( hex.length ~/ 2, (i) => int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16))); -List createDownloadTokens(int n) { +Uint8List createDownloadToken() { final Random random = Random(); - List tokens = []; - for (int i = 0; i < n; i++) { - Uint8List token = Uint8List(32); - for (int j = 0; j < 32; j++) { - token[j] = random.nextInt(256); // Generate a random byte (0-255) - } - tokens.add(token); + Uint8List token = Uint8List(32); + for (int j = 0; j < 32; j++) { + token[j] = random.nextInt(256); // Generate a random byte (0-255) } - - return tokens; + return token; } diff --git a/lib/src/services/api/messages.dart b/lib/src/services/api/messages.dart index 26982a0..22481ec 100644 --- a/lib/src/services/api/messages.dart +++ b/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(), ), diff --git a/lib/src/services/api/server_messages.dart b/lib/src/services/api/server_messages.dart index 07083ed..ca10938 100644 --- a/lib/src/services/api/server_messages.dart +++ b/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 handleNewMessage(int fromUserId, Uint8List body) async { fromUserId, MessageJson( kind: MessageKind.ack, - messageId: null, content: AckContent( - messageIdToAck: message.messageId, - retransIdToAck: message.retransId!), + messageIdToAck: message.messageSenderId, + retransIdToAck: message.retransId!, + ), timestamp: DateTime.now(), ), ); @@ -166,29 +168,69 @@ Future handleNewMessage(int fromUserId, Uint8List body) async { } case MessageKind.receiveMediaError: - if (message.messageId != null) { - await twonlyDB.messagesDao.updateMessageByOtherUser( - fromUserId, - message.messageId!, - MessagesCompanion( - errorWhileSending: Value(true), - ), - ); + if (message.messageReceiverId != null) { + final openedMessage = await twonlyDB.messagesDao + .getMessageByIdAndContactId(fromUserId, message.messageReceiverId!) + .getSingleOrNull(); + + 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 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) { - Log.error("Content or messageid not defined $message"); + } else if (message.messageSenderId == null) { + Log.error("Messageid not defined $message"); } else { - final content = message.content!; - - if (content is StoredMediaFileContent) { - /// stored media file just updates the message - await twonlyDB.messagesDao.updateMessageByOtherUser( - fromUserId, - content.messageId, - MessagesCompanion( - mediaStored: Value(true), - errorWhileSending: Value(false), - ), - ); - final message = await twonlyDB.messagesDao - .getMessageByIdAndContactId(fromUserId, content.messageId) - .getSingleOrNull(); - if (message != null && message.mediaUploadId != null) { - final filePath = - await getMediaFilePath(message.mediaUploadId, "send"); - if (filePath.contains("mp4")) { - createThumbnailsForVideo(File(filePath)); - } else { - createThumbnailsForImage(File(filePath)); + if (message.kind == MessageKind.storedMediaFile) { + if (message.messageReceiverId != null) { + /// stored media file just updates the message + await twonlyDB.messagesDao.updateMessageByOtherUser( + fromUserId, + message.messageReceiverId!, + MessagesCompanion( + mediaStored: Value(true), + errorWhileSending: Value(false), + ), + ); + final msg = await twonlyDB.messagesDao + .getMessageByIdAndContactId( + fromUserId, message.messageReceiverId!) + .getSingleOrNull(); + if (msg != null && msg.mediaUploadId != null) { + final filePath = + await getMediaFilePath(msg.mediaUploadId, "send"); + if (filePath.contains("mp4")) { + createThumbnailsForVideo(File(filePath)); + } else { + 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!))) { - Log.error( - "Got a duplicated message from other user: ${message.messageId!}"); - var ok = client.Response_Ok()..none = true; - return client.Response()..ok = ok; + + final openedMessage = await twonlyDB.messagesDao + .getMessageByOtherMessageId(fromUserId, message.messageSenderId!) + .getSingleOrNull(); + + 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 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 handleNewMessage(int fromUserId, Uint8List body) async { startDownloadMedia(msg, false); } } + } else { + Log.error("Content is not defined $message"); } // unarchive contact when receiving a new message diff --git a/lib/src/services/api/utils.dart b/lib/src/services/api/utils.dart index 2458916..8879114 100644 --- a/lib/src/services/api/utils.dart +++ b/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, - timestamp: DateTime.now(), - content: MessageContent(), - messageId: message.messageOtherId), + kind: MessageKind.receiveMediaError, + timestamp: DateTime.now(), + content: MessageContent(), + messageReceiverId: message.messageOtherId, + ), ); } } diff --git a/lib/src/views/chats/chat_messages_components/chat_media_entry.dart b/lib/src/views/chats/chat_messages_components/chat_media_entry.dart index e9ec71c..c774d8e 100644 --- a/lib/src/views/chats/chat_messages_components/chat_media_entry.dart +++ b/lib/src/views/chats/chat_messages_components/chat_media_entry.dart @@ -81,7 +81,7 @@ class _ChatMediaEntryState extends State { widget.contact.userId, MessageJson( kind: MessageKind.reopenedMedia, - messageId: widget.message.messageId, + messageSenderId: widget.message.messageId, content: ReopenedMediaFileContent( messageId: widget.message.messageOtherId!, ), diff --git a/lib/src/views/chats/media_viewer.view.dart b/lib/src/views/chats/media_viewer.view.dart index 3bc30aa..ac4cef5 100644 --- a/lib/src/views/chats/media_viewer.view.dart +++ b/lib/src/views/chats/media_viewer.view.dart @@ -313,10 +313,9 @@ class _MediaViewerViewState extends State { widget.contact.userId, MessageJson( kind: MessageKind.storedMediaFile, - messageId: allMediaFiles.first.messageId, - content: StoredMediaFileContent( - messageId: allMediaFiles.first.messageOtherId!, - ), + messageSenderId: allMediaFiles.first.messageId, + messageReceiverId: allMediaFiles.first.messageOtherId!, + content: MessageContent(), timestamp: DateTime.now(), ), pushNotification: PushNotification(kind: PushKind.storedMediaFile), diff --git a/lib/src/views/components/message_send_state_icon.dart b/lib/src/views/components/message_send_state_icon.dart index c78470c..f62e0e1 100644 --- a/lib/src/views/components/message_send_state_icon.dart +++ b/lib/src/views/components/message_send_state_icon.dart @@ -175,6 +175,14 @@ class _MessageSendStateIconState extends State { 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 { diff --git a/lib/src/views/settings/help/contact_us.view.dart b/lib/src/views/settings/help/contact_us.view.dart index 4d180fa..65f97d1 100644 --- a/lib/src/views/settings/help/contact_us.view.dart +++ b/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 { Future uploadDebugLog() async { if (debugLogDownloadToken != null) return debugLogDownloadToken; - Uint8List downloadToken = createDownloadTokens(1)[0]; + Uint8List downloadToken = createDownloadToken(); String debugLog = await loadLogFile(); diff --git a/test/drift/twonly_database/generated/schema.dart b/test/drift/twonly_database/generated/schema.dart index 5e19610..dbff68f 100644 --- a/test/drift/twonly_database/generated/schema.dart +++ b/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 + ]; } diff --git a/test/drift/twonly_database/generated/schema_v1.dart b/test/drift/twonly_database/generated/schema_v1.dart index b6a8122..7a33b10 100644 --- a/test/drift/twonly_database/generated/schema_v1.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1307,7 +1308,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -1339,7 +1340,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1349,7 +1350,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -1442,7 +1443,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -1464,7 +1465,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1497,9 +1498,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -1537,7 +1538,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -1563,7 +1564,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1572,13 +1573,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -1643,7 +1644,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -1659,7 +1660,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1687,9 +1688,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -1720,14 +1721,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -1743,7 +1744,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -1751,12 +1752,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -1821,7 +1822,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -1837,7 +1838,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -1868,8 +1869,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1913,7 +1914,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -1945,7 +1946,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1955,7 +1956,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2048,7 +2049,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2070,7 +2071,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v10.dart b/test/drift/twonly_database/generated/schema_v10.dart index 5267b2f..dbc3577 100644 --- a/test/drift/twonly_database/generated/schema_v10.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass implements Insertable { 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 = {}; map['contact_id'] = Variable(contactId); map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass return SignalContactPreKeysData( contactId: serializer.fromJson(json['contactId']), preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value contactId; final Value preKeyId; - final Value preKey; + final Value preKey; final Value createdAt; final Value 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 custom({ Expression? contactId, Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, Expression? rowid, }) { @@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion SignalContactPreKeysCompanion copyWith( {Value? contactId, Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt, Value? rowid}) { return SignalContactPreKeysCompanion( @@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table late final GeneratedColumn signedPreKeyId = GeneratedColumn( 'signed_pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn signedPreKey = - GeneratedColumn('signed_pre_key', aliasedName, false, + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn signedPreKeySignature = - GeneratedColumn('signed_pre_key_signature', aliasedName, false, + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass implements Insertable { final int contactId; final int signedPreKeyId; - final Uint8List signedPreKey; - final Uint8List signedPreKeySignature; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; final DateTime createdAt; const SignalContactSignedPreKeysData( {required this.contactId, @@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass final map = {}; map['contact_id'] = Variable(contactId); map['signed_pre_key_id'] = Variable(signedPreKeyId); - map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key'] = Variable(signedPreKey); map['signed_pre_key_signature'] = - Variable(signedPreKeySignature); + Variable(signedPreKeySignature); map['created_at'] = Variable(createdAt); return map; } @@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass return SignalContactSignedPreKeysData( contactId: serializer.fromJson(json['contactId']), signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), - signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKey: serializer.fromJson(json['signedPreKey']), signedPreKeySignature: - serializer.fromJson(json['signedPreKeySignature']), + serializer.fromJson(json['signedPreKeySignature']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'signedPreKeyId': serializer.toJson(signedPreKeyId), - 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKey': serializer.toJson(signedPreKey), 'signedPreKeySignature': - serializer.toJson(signedPreKeySignature), + serializer.toJson(signedPreKeySignature), 'createdAt': serializer.toJson(createdAt), }; } @@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass SignalContactSignedPreKeysData copyWith( {int? contactId, int? signedPreKeyId, - Uint8List? signedPreKey, - Uint8List? signedPreKeySignature, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, DateTime? createdAt}) => SignalContactSignedPreKeysData( contactId: contactId ?? this.contactId, @@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion extends UpdateCompanion { final Value contactId; final Value signedPreKeyId; - final Value signedPreKey; - final Value signedPreKeySignature; + final Value signedPreKey; + final Value signedPreKeySignature; final Value 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 Uint8List signedPreKeySignature, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, this.createdAt = const Value.absent(), }) : signedPreKeyId = Value(signedPreKeyId), signedPreKey = Value(signedPreKey), @@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion static Insertable custom({ Expression? contactId, Expression? signedPreKeyId, - Expression? signedPreKey, - Expression? signedPreKeySignature, + Expression? signedPreKey, + Expression? signedPreKeySignature, Expression? createdAt, }) { return RawValuesInsertable({ @@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion SignalContactSignedPreKeysCompanion copyWith( {Value? contactId, Value? signedPreKeyId, - Value? signedPreKey, - Value? signedPreKeySignature, + Value? signedPreKey, + Value? signedPreKeySignature, Value? createdAt}) { return SignalContactSignedPreKeysCompanion( contactId: contactId ?? this.contactId, @@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion map['signed_pre_key_id'] = Variable(signedPreKeyId.value); } if (signedPreKey.present) { - map['signed_pre_key'] = Variable(signedPreKey.value); + map['signed_pre_key'] = Variable(signedPreKey.value); } if (signedPreKeySignature.present) { map['signed_pre_key_signature'] = - Variable(signedPreKeySignature.value); + Variable(signedPreKeySignature.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v11.dart b/test/drift/twonly_database/generated/schema_v11.dart index 0ab34f2..bd6a20f 100644 --- a/test/drift/twonly_database/generated/schema_v11.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass implements Insertable { 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 = {}; map['contact_id'] = Variable(contactId); map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass return SignalContactPreKeysData( contactId: serializer.fromJson(json['contactId']), preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value contactId; final Value preKeyId; - final Value preKey; + final Value preKey; final Value createdAt; final Value 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 custom({ Expression? contactId, Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, Expression? rowid, }) { @@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion SignalContactPreKeysCompanion copyWith( {Value? contactId, Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt, Value? rowid}) { return SignalContactPreKeysCompanion( @@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table late final GeneratedColumn signedPreKeyId = GeneratedColumn( 'signed_pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn signedPreKey = - GeneratedColumn('signed_pre_key', aliasedName, false, + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn signedPreKeySignature = - GeneratedColumn('signed_pre_key_signature', aliasedName, false, + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass implements Insertable { final int contactId; final int signedPreKeyId; - final Uint8List signedPreKey; - final Uint8List signedPreKeySignature; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; final DateTime createdAt; const SignalContactSignedPreKeysData( {required this.contactId, @@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass final map = {}; map['contact_id'] = Variable(contactId); map['signed_pre_key_id'] = Variable(signedPreKeyId); - map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key'] = Variable(signedPreKey); map['signed_pre_key_signature'] = - Variable(signedPreKeySignature); + Variable(signedPreKeySignature); map['created_at'] = Variable(createdAt); return map; } @@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass return SignalContactSignedPreKeysData( contactId: serializer.fromJson(json['contactId']), signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), - signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKey: serializer.fromJson(json['signedPreKey']), signedPreKeySignature: - serializer.fromJson(json['signedPreKeySignature']), + serializer.fromJson(json['signedPreKeySignature']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'signedPreKeyId': serializer.toJson(signedPreKeyId), - 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKey': serializer.toJson(signedPreKey), 'signedPreKeySignature': - serializer.toJson(signedPreKeySignature), + serializer.toJson(signedPreKeySignature), 'createdAt': serializer.toJson(createdAt), }; } @@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass SignalContactSignedPreKeysData copyWith( {int? contactId, int? signedPreKeyId, - Uint8List? signedPreKey, - Uint8List? signedPreKeySignature, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, DateTime? createdAt}) => SignalContactSignedPreKeysData( contactId: contactId ?? this.contactId, @@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion extends UpdateCompanion { final Value contactId; final Value signedPreKeyId; - final Value signedPreKey; - final Value signedPreKeySignature; + final Value signedPreKey; + final Value signedPreKeySignature; final Value 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 Uint8List signedPreKeySignature, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, this.createdAt = const Value.absent(), }) : signedPreKeyId = Value(signedPreKeyId), signedPreKey = Value(signedPreKey), @@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion static Insertable custom({ Expression? contactId, Expression? signedPreKeyId, - Expression? signedPreKey, - Expression? signedPreKeySignature, + Expression? signedPreKey, + Expression? signedPreKeySignature, Expression? createdAt, }) { return RawValuesInsertable({ @@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion SignalContactSignedPreKeysCompanion copyWith( {Value? contactId, Value? signedPreKeyId, - Value? signedPreKey, - Value? signedPreKeySignature, + Value? signedPreKey, + Value? signedPreKeySignature, Value? createdAt}) { return SignalContactSignedPreKeysCompanion( contactId: contactId ?? this.contactId, @@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion map['signed_pre_key_id'] = Variable(signedPreKeyId.value); } if (signedPreKey.present) { - map['signed_pre_key'] = Variable(signedPreKey.value); + map['signed_pre_key'] = Variable(signedPreKey.value); } if (signedPreKeySignature.present) { map['signed_pre_key_signature'] = - Variable(signedPreKeySignature.value); + Variable(signedPreKeySignature.value); } if (createdAt.present) { map['created_at'] = Variable(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 plaintextContent = - GeneratedColumn('plaintext_content', aliasedName, false, + late final GeneratedColumn plaintextContent = + GeneratedColumn('plaintext_content', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn pushData = GeneratedColumn( - 'push_data', aliasedName, true, - type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn pushData = + GeneratedColumn('push_data', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); late final GeneratedColumn acknowledgeByServerAt = GeneratedColumn('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 Uint8List? pushData; + final i2.Uint8List plaintextContent; + 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(messageId); } - map['plaintext_content'] = Variable(plaintextContent); + map['plaintext_content'] = Variable(plaintextContent); if (!nullToAbsent || pushData != null) { - map['push_data'] = Variable(pushData); + map['push_data'] = Variable(pushData); } if (!nullToAbsent || acknowledgeByServerAt != null) { map['acknowledge_by_server_at'] = @@ -3614,8 +3616,8 @@ class MessageRetransmissionsData extends DataClass contactId: serializer.fromJson(json['contactId']), messageId: serializer.fromJson(json['messageId']), plaintextContent: - serializer.fromJson(json['plaintextContent']), - pushData: serializer.fromJson(json['pushData']), + serializer.fromJson(json['plaintextContent']), + pushData: serializer.fromJson(json['pushData']), acknowledgeByServerAt: serializer.fromJson(json['acknowledgeByServerAt']), ); @@ -3627,8 +3629,8 @@ class MessageRetransmissionsData extends DataClass 'retransmissionId': serializer.toJson(retransmissionId), 'contactId': serializer.toJson(contactId), 'messageId': serializer.toJson(messageId), - 'plaintextContent': serializer.toJson(plaintextContent), - 'pushData': serializer.toJson(pushData), + 'plaintextContent': serializer.toJson(plaintextContent), + 'pushData': serializer.toJson(pushData), 'acknowledgeByServerAt': serializer.toJson(acknowledgeByServerAt), }; @@ -3638,8 +3640,8 @@ class MessageRetransmissionsData extends DataClass {int? retransmissionId, int? contactId, Value messageId = const Value.absent(), - Uint8List? plaintextContent, - Value pushData = const Value.absent(), + i2.Uint8List? plaintextContent, + Value pushData = const Value.absent(), Value acknowledgeByServerAt = const Value.absent()}) => MessageRetransmissionsData( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3708,8 +3710,8 @@ class MessageRetransmissionsCompanion final Value retransmissionId; final Value contactId; final Value messageId; - final Value plaintextContent; - final Value pushData; + final Value plaintextContent; + final Value pushData; final Value 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? retransmissionId, Expression? contactId, Expression? messageId, - Expression? plaintextContent, - Expression? pushData, + Expression? plaintextContent, + Expression? pushData, Expression? acknowledgeByServerAt, }) { return RawValuesInsertable({ @@ -3751,8 +3753,8 @@ class MessageRetransmissionsCompanion {Value? retransmissionId, Value? contactId, Value? messageId, - Value? plaintextContent, - Value? pushData, + Value? plaintextContent, + Value? pushData, Value? acknowledgeByServerAt}) { return MessageRetransmissionsCompanion( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3778,10 +3780,10 @@ class MessageRetransmissionsCompanion map['message_id'] = Variable(messageId.value); } if (plaintextContent.present) { - map['plaintext_content'] = Variable(plaintextContent.value); + map['plaintext_content'] = Variable(plaintextContent.value); } if (pushData.present) { - map['push_data'] = Variable(pushData.value); + map['push_data'] = Variable(pushData.value); } if (acknowledgeByServerAt.present) { map['acknowledge_by_server_at'] = diff --git a/test/drift/twonly_database/generated/schema_v12.dart b/test/drift/twonly_database/generated/schema_v12.dart index eeeaeb0..56143b6 100644 --- a/test/drift/twonly_database/generated/schema_v12.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass implements Insertable { 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 = {}; map['contact_id'] = Variable(contactId); map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass return SignalContactPreKeysData( contactId: serializer.fromJson(json['contactId']), preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value contactId; final Value preKeyId; - final Value preKey; + final Value preKey; final Value createdAt; final Value 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 custom({ Expression? contactId, Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, Expression? rowid, }) { @@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion SignalContactPreKeysCompanion copyWith( {Value? contactId, Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt, Value? rowid}) { return SignalContactPreKeysCompanion( @@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table late final GeneratedColumn signedPreKeyId = GeneratedColumn( 'signed_pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn signedPreKey = - GeneratedColumn('signed_pre_key', aliasedName, false, + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn signedPreKeySignature = - GeneratedColumn('signed_pre_key_signature', aliasedName, false, + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass implements Insertable { final int contactId; final int signedPreKeyId; - final Uint8List signedPreKey; - final Uint8List signedPreKeySignature; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; final DateTime createdAt; const SignalContactSignedPreKeysData( {required this.contactId, @@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass final map = {}; map['contact_id'] = Variable(contactId); map['signed_pre_key_id'] = Variable(signedPreKeyId); - map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key'] = Variable(signedPreKey); map['signed_pre_key_signature'] = - Variable(signedPreKeySignature); + Variable(signedPreKeySignature); map['created_at'] = Variable(createdAt); return map; } @@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass return SignalContactSignedPreKeysData( contactId: serializer.fromJson(json['contactId']), signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), - signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKey: serializer.fromJson(json['signedPreKey']), signedPreKeySignature: - serializer.fromJson(json['signedPreKeySignature']), + serializer.fromJson(json['signedPreKeySignature']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'signedPreKeyId': serializer.toJson(signedPreKeyId), - 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKey': serializer.toJson(signedPreKey), 'signedPreKeySignature': - serializer.toJson(signedPreKeySignature), + serializer.toJson(signedPreKeySignature), 'createdAt': serializer.toJson(createdAt), }; } @@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass SignalContactSignedPreKeysData copyWith( {int? contactId, int? signedPreKeyId, - Uint8List? signedPreKey, - Uint8List? signedPreKeySignature, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, DateTime? createdAt}) => SignalContactSignedPreKeysData( contactId: contactId ?? this.contactId, @@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion extends UpdateCompanion { final Value contactId; final Value signedPreKeyId; - final Value signedPreKey; - final Value signedPreKeySignature; + final Value signedPreKey; + final Value signedPreKeySignature; final Value 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 Uint8List signedPreKeySignature, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, this.createdAt = const Value.absent(), }) : signedPreKeyId = Value(signedPreKeyId), signedPreKey = Value(signedPreKey), @@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion static Insertable custom({ Expression? contactId, Expression? signedPreKeyId, - Expression? signedPreKey, - Expression? signedPreKeySignature, + Expression? signedPreKey, + Expression? signedPreKeySignature, Expression? createdAt, }) { return RawValuesInsertable({ @@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion SignalContactSignedPreKeysCompanion copyWith( {Value? contactId, Value? signedPreKeyId, - Value? signedPreKey, - Value? signedPreKeySignature, + Value? signedPreKey, + Value? signedPreKeySignature, Value? createdAt}) { return SignalContactSignedPreKeysCompanion( contactId: contactId ?? this.contactId, @@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion map['signed_pre_key_id'] = Variable(signedPreKeyId.value); } if (signedPreKey.present) { - map['signed_pre_key'] = Variable(signedPreKey.value); + map['signed_pre_key'] = Variable(signedPreKey.value); } if (signedPreKeySignature.present) { map['signed_pre_key_signature'] = - Variable(signedPreKeySignature.value); + Variable(signedPreKeySignature.value); } if (createdAt.present) { map['created_at'] = Variable(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 plaintextContent = - GeneratedColumn('plaintext_content', aliasedName, false, + late final GeneratedColumn plaintextContent = + GeneratedColumn('plaintext_content', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn pushData = GeneratedColumn( - 'push_data', aliasedName, true, - type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn pushData = + GeneratedColumn('push_data', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); late final GeneratedColumn willNotGetACKByUser = GeneratedColumn( '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 Uint8List? pushData; + final i2.Uint8List plaintextContent; + 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(messageId); } - map['plaintext_content'] = Variable(plaintextContent); + map['plaintext_content'] = Variable(plaintextContent); if (!nullToAbsent || pushData != null) { - map['push_data'] = Variable(pushData); + map['push_data'] = Variable(pushData); } map['will_not_get_a_c_k_by_user'] = Variable(willNotGetACKByUser); if (!nullToAbsent || acknowledgeByServerAt != null) { @@ -3628,8 +3630,8 @@ class MessageRetransmissionsData extends DataClass contactId: serializer.fromJson(json['contactId']), messageId: serializer.fromJson(json['messageId']), plaintextContent: - serializer.fromJson(json['plaintextContent']), - pushData: serializer.fromJson(json['pushData']), + serializer.fromJson(json['plaintextContent']), + pushData: serializer.fromJson(json['pushData']), willNotGetACKByUser: serializer.fromJson(json['willNotGetACKByUser']), acknowledgeByServerAt: @@ -3643,8 +3645,8 @@ class MessageRetransmissionsData extends DataClass 'retransmissionId': serializer.toJson(retransmissionId), 'contactId': serializer.toJson(contactId), 'messageId': serializer.toJson(messageId), - 'plaintextContent': serializer.toJson(plaintextContent), - 'pushData': serializer.toJson(pushData), + 'plaintextContent': serializer.toJson(plaintextContent), + 'pushData': serializer.toJson(pushData), 'willNotGetACKByUser': serializer.toJson(willNotGetACKByUser), 'acknowledgeByServerAt': serializer.toJson(acknowledgeByServerAt), @@ -3655,8 +3657,8 @@ class MessageRetransmissionsData extends DataClass {int? retransmissionId, int? contactId, Value messageId = const Value.absent(), - Uint8List? plaintextContent, - Value pushData = const Value.absent(), + i2.Uint8List? plaintextContent, + Value pushData = const Value.absent(), bool? willNotGetACKByUser, Value acknowledgeByServerAt = const Value.absent()}) => MessageRetransmissionsData( @@ -3733,8 +3735,8 @@ class MessageRetransmissionsCompanion final Value retransmissionId; final Value contactId; final Value messageId; - final Value plaintextContent; - final Value pushData; + final Value plaintextContent; + final Value pushData; final Value willNotGetACKByUser; final Value 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? retransmissionId, Expression? contactId, Expression? messageId, - Expression? plaintextContent, - Expression? pushData, + Expression? plaintextContent, + Expression? pushData, Expression? willNotGetACKByUser, Expression? acknowledgeByServerAt, }) { @@ -3782,8 +3784,8 @@ class MessageRetransmissionsCompanion {Value? retransmissionId, Value? contactId, Value? messageId, - Value? plaintextContent, - Value? pushData, + Value? plaintextContent, + Value? pushData, Value? willNotGetACKByUser, Value? acknowledgeByServerAt}) { return MessageRetransmissionsCompanion( @@ -3811,10 +3813,10 @@ class MessageRetransmissionsCompanion map['message_id'] = Variable(messageId.value); } if (plaintextContent.present) { - map['plaintext_content'] = Variable(plaintextContent.value); + map['plaintext_content'] = Variable(plaintextContent.value); } if (pushData.present) { - map['push_data'] = Variable(pushData.value); + map['push_data'] = Variable(pushData.value); } if (willNotGetACKByUser.present) { map['will_not_get_a_c_k_by_user'] = diff --git a/test/drift/twonly_database/generated/schema_v13.dart b/test/drift/twonly_database/generated/schema_v13.dart index 105cb84..699f6c7 100644 --- a/test/drift/twonly_database/generated/schema_v13.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass implements Insertable { 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 = {}; map['contact_id'] = Variable(contactId); map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass return SignalContactPreKeysData( contactId: serializer.fromJson(json['contactId']), preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value contactId; final Value preKeyId; - final Value preKey; + final Value preKey; final Value createdAt; final Value 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 custom({ Expression? contactId, Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, Expression? rowid, }) { @@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion SignalContactPreKeysCompanion copyWith( {Value? contactId, Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt, Value? rowid}) { return SignalContactPreKeysCompanion( @@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table late final GeneratedColumn signedPreKeyId = GeneratedColumn( 'signed_pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn signedPreKey = - GeneratedColumn('signed_pre_key', aliasedName, false, + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn signedPreKeySignature = - GeneratedColumn('signed_pre_key_signature', aliasedName, false, + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass implements Insertable { final int contactId; final int signedPreKeyId; - final Uint8List signedPreKey; - final Uint8List signedPreKeySignature; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; final DateTime createdAt; const SignalContactSignedPreKeysData( {required this.contactId, @@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass final map = {}; map['contact_id'] = Variable(contactId); map['signed_pre_key_id'] = Variable(signedPreKeyId); - map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key'] = Variable(signedPreKey); map['signed_pre_key_signature'] = - Variable(signedPreKeySignature); + Variable(signedPreKeySignature); map['created_at'] = Variable(createdAt); return map; } @@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass return SignalContactSignedPreKeysData( contactId: serializer.fromJson(json['contactId']), signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), - signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKey: serializer.fromJson(json['signedPreKey']), signedPreKeySignature: - serializer.fromJson(json['signedPreKeySignature']), + serializer.fromJson(json['signedPreKeySignature']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'signedPreKeyId': serializer.toJson(signedPreKeyId), - 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKey': serializer.toJson(signedPreKey), 'signedPreKeySignature': - serializer.toJson(signedPreKeySignature), + serializer.toJson(signedPreKeySignature), 'createdAt': serializer.toJson(createdAt), }; } @@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass SignalContactSignedPreKeysData copyWith( {int? contactId, int? signedPreKeyId, - Uint8List? signedPreKey, - Uint8List? signedPreKeySignature, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, DateTime? createdAt}) => SignalContactSignedPreKeysData( contactId: contactId ?? this.contactId, @@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion extends UpdateCompanion { final Value contactId; final Value signedPreKeyId; - final Value signedPreKey; - final Value signedPreKeySignature; + final Value signedPreKey; + final Value signedPreKeySignature; final Value 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 Uint8List signedPreKeySignature, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, this.createdAt = const Value.absent(), }) : signedPreKeyId = Value(signedPreKeyId), signedPreKey = Value(signedPreKey), @@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion static Insertable custom({ Expression? contactId, Expression? signedPreKeyId, - Expression? signedPreKey, - Expression? signedPreKeySignature, + Expression? signedPreKey, + Expression? signedPreKeySignature, Expression? createdAt, }) { return RawValuesInsertable({ @@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion SignalContactSignedPreKeysCompanion copyWith( {Value? contactId, Value? signedPreKeyId, - Value? signedPreKey, - Value? signedPreKeySignature, + Value? signedPreKey, + Value? signedPreKeySignature, Value? createdAt}) { return SignalContactSignedPreKeysCompanion( contactId: contactId ?? this.contactId, @@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion map['signed_pre_key_id'] = Variable(signedPreKeyId.value); } if (signedPreKey.present) { - map['signed_pre_key'] = Variable(signedPreKey.value); + map['signed_pre_key'] = Variable(signedPreKey.value); } if (signedPreKeySignature.present) { map['signed_pre_key_signature'] = - Variable(signedPreKeySignature.value); + Variable(signedPreKeySignature.value); } if (createdAt.present) { map['created_at'] = Variable(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 plaintextContent = - GeneratedColumn('plaintext_content', aliasedName, false, + late final GeneratedColumn plaintextContent = + GeneratedColumn('plaintext_content', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn pushData = GeneratedColumn( - 'push_data', aliasedName, true, - type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn pushData = + GeneratedColumn('push_data', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); late final GeneratedColumn acknowledgeByServerAt = GeneratedColumn('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 Uint8List? pushData; + final i2.Uint8List plaintextContent; + 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(messageId); } - map['plaintext_content'] = Variable(plaintextContent); + map['plaintext_content'] = Variable(plaintextContent); if (!nullToAbsent || pushData != null) { - map['push_data'] = Variable(pushData); + map['push_data'] = Variable(pushData); } if (!nullToAbsent || acknowledgeByServerAt != null) { map['acknowledge_by_server_at'] = @@ -3614,8 +3616,8 @@ class MessageRetransmissionsData extends DataClass contactId: serializer.fromJson(json['contactId']), messageId: serializer.fromJson(json['messageId']), plaintextContent: - serializer.fromJson(json['plaintextContent']), - pushData: serializer.fromJson(json['pushData']), + serializer.fromJson(json['plaintextContent']), + pushData: serializer.fromJson(json['pushData']), acknowledgeByServerAt: serializer.fromJson(json['acknowledgeByServerAt']), ); @@ -3627,8 +3629,8 @@ class MessageRetransmissionsData extends DataClass 'retransmissionId': serializer.toJson(retransmissionId), 'contactId': serializer.toJson(contactId), 'messageId': serializer.toJson(messageId), - 'plaintextContent': serializer.toJson(plaintextContent), - 'pushData': serializer.toJson(pushData), + 'plaintextContent': serializer.toJson(plaintextContent), + 'pushData': serializer.toJson(pushData), 'acknowledgeByServerAt': serializer.toJson(acknowledgeByServerAt), }; @@ -3638,8 +3640,8 @@ class MessageRetransmissionsData extends DataClass {int? retransmissionId, int? contactId, Value messageId = const Value.absent(), - Uint8List? plaintextContent, - Value pushData = const Value.absent(), + i2.Uint8List? plaintextContent, + Value pushData = const Value.absent(), Value acknowledgeByServerAt = const Value.absent()}) => MessageRetransmissionsData( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3708,8 +3710,8 @@ class MessageRetransmissionsCompanion final Value retransmissionId; final Value contactId; final Value messageId; - final Value plaintextContent; - final Value pushData; + final Value plaintextContent; + final Value pushData; final Value 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? retransmissionId, Expression? contactId, Expression? messageId, - Expression? plaintextContent, - Expression? pushData, + Expression? plaintextContent, + Expression? pushData, Expression? acknowledgeByServerAt, }) { return RawValuesInsertable({ @@ -3751,8 +3753,8 @@ class MessageRetransmissionsCompanion {Value? retransmissionId, Value? contactId, Value? messageId, - Value? plaintextContent, - Value? pushData, + Value? plaintextContent, + Value? pushData, Value? acknowledgeByServerAt}) { return MessageRetransmissionsCompanion( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3778,10 +3780,10 @@ class MessageRetransmissionsCompanion map['message_id'] = Variable(messageId.value); } if (plaintextContent.present) { - map['plaintext_content'] = Variable(plaintextContent.value); + map['plaintext_content'] = Variable(plaintextContent.value); } if (pushData.present) { - map['push_data'] = Variable(pushData.value); + map['push_data'] = Variable(pushData.value); } if (acknowledgeByServerAt.present) { map['acknowledge_by_server_at'] = diff --git a/test/drift/twonly_database/generated/schema_v14.dart b/test/drift/twonly_database/generated/schema_v14.dart index 8b1f025..26e6833 100644 --- a/test/drift/twonly_database/generated/schema_v14.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2177,7 +2178,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2209,7 +2210,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2219,7 +2220,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2312,7 +2313,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2334,7 +2335,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2367,9 +2368,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2407,7 +2408,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2433,7 +2434,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2442,13 +2443,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2513,7 +2514,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2529,7 +2530,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2557,9 +2558,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2590,14 +2591,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2613,7 +2614,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2621,12 +2622,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2691,7 +2692,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2707,7 +2708,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2738,8 +2739,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2783,7 +2784,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2815,7 +2816,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2825,7 +2826,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2918,7 +2919,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2940,7 +2941,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2976,9 +2977,9 @@ class SignalContactPreKeys extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -3021,7 +3022,7 @@ class SignalContactPreKeysData extends DataClass implements Insertable { 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 = {}; map['contact_id'] = Variable(contactId); map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -3053,7 +3054,7 @@ class SignalContactPreKeysData extends DataClass return SignalContactPreKeysData( contactId: serializer.fromJson(json['contactId']), preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3063,7 +3064,7 @@ class SignalContactPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value contactId; final Value preKeyId; - final Value preKey; + final Value preKey; final Value createdAt; final Value 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 custom({ Expression? contactId, Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, Expression? rowid, }) { @@ -3155,7 +3156,7 @@ class SignalContactPreKeysCompanion SignalContactPreKeysCompanion copyWith( {Value? contactId, Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt, Value? rowid}) { return SignalContactPreKeysCompanion( @@ -3177,7 +3178,7 @@ class SignalContactPreKeysCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -3213,11 +3214,12 @@ class SignalContactSignedPreKeys extends Table late final GeneratedColumn signedPreKeyId = GeneratedColumn( 'signed_pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: true); - late final GeneratedColumn signedPreKey = - GeneratedColumn('signed_pre_key', aliasedName, false, + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn signedPreKeySignature = - GeneratedColumn('signed_pre_key_signature', aliasedName, false, + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -3269,8 +3271,8 @@ class SignalContactSignedPreKeysData extends DataClass implements Insertable { final int contactId; final int signedPreKeyId; - final Uint8List signedPreKey; - final Uint8List signedPreKeySignature; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; final DateTime createdAt; const SignalContactSignedPreKeysData( {required this.contactId, @@ -3283,9 +3285,9 @@ class SignalContactSignedPreKeysData extends DataClass final map = {}; map['contact_id'] = Variable(contactId); map['signed_pre_key_id'] = Variable(signedPreKeyId); - map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key'] = Variable(signedPreKey); map['signed_pre_key_signature'] = - Variable(signedPreKeySignature); + Variable(signedPreKeySignature); map['created_at'] = Variable(createdAt); return map; } @@ -3306,9 +3308,9 @@ class SignalContactSignedPreKeysData extends DataClass return SignalContactSignedPreKeysData( contactId: serializer.fromJson(json['contactId']), signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), - signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKey: serializer.fromJson(json['signedPreKey']), signedPreKeySignature: - serializer.fromJson(json['signedPreKeySignature']), + serializer.fromJson(json['signedPreKeySignature']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -3318,9 +3320,9 @@ class SignalContactSignedPreKeysData extends DataClass return { 'contactId': serializer.toJson(contactId), 'signedPreKeyId': serializer.toJson(signedPreKeyId), - 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKey': serializer.toJson(signedPreKey), 'signedPreKeySignature': - serializer.toJson(signedPreKeySignature), + serializer.toJson(signedPreKeySignature), 'createdAt': serializer.toJson(createdAt), }; } @@ -3328,8 +3330,8 @@ class SignalContactSignedPreKeysData extends DataClass SignalContactSignedPreKeysData copyWith( {int? contactId, int? signedPreKeyId, - Uint8List? signedPreKey, - Uint8List? signedPreKeySignature, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, DateTime? createdAt}) => SignalContactSignedPreKeysData( contactId: contactId ?? this.contactId, @@ -3391,8 +3393,8 @@ class SignalContactSignedPreKeysCompanion extends UpdateCompanion { final Value contactId; final Value signedPreKeyId; - final Value signedPreKey; - final Value signedPreKeySignature; + final Value signedPreKey; + final Value signedPreKeySignature; final Value 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 Uint8List signedPreKeySignature, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, this.createdAt = const Value.absent(), }) : signedPreKeyId = Value(signedPreKeyId), signedPreKey = Value(signedPreKey), @@ -3413,8 +3415,8 @@ class SignalContactSignedPreKeysCompanion static Insertable custom({ Expression? contactId, Expression? signedPreKeyId, - Expression? signedPreKey, - Expression? signedPreKeySignature, + Expression? signedPreKey, + Expression? signedPreKeySignature, Expression? createdAt, }) { return RawValuesInsertable({ @@ -3430,8 +3432,8 @@ class SignalContactSignedPreKeysCompanion SignalContactSignedPreKeysCompanion copyWith( {Value? contactId, Value? signedPreKeyId, - Value? signedPreKey, - Value? signedPreKeySignature, + Value? signedPreKey, + Value? signedPreKeySignature, Value? createdAt}) { return SignalContactSignedPreKeysCompanion( contactId: contactId ?? this.contactId, @@ -3453,11 +3455,11 @@ class SignalContactSignedPreKeysCompanion map['signed_pre_key_id'] = Variable(signedPreKeyId.value); } if (signedPreKey.present) { - map['signed_pre_key'] = Variable(signedPreKey.value); + map['signed_pre_key'] = Variable(signedPreKey.value); } if (signedPreKeySignature.present) { map['signed_pre_key_signature'] = - Variable(signedPreKeySignature.value); + Variable(signedPreKeySignature.value); } if (createdAt.present) { map['created_at'] = Variable(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 plaintextContent = - GeneratedColumn('plaintext_content', aliasedName, false, + late final GeneratedColumn plaintextContent = + GeneratedColumn('plaintext_content', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); - late final GeneratedColumn pushData = GeneratedColumn( - 'push_data', aliasedName, true, - type: DriftSqlType.blob, requiredDuringInsert: false); - late final GeneratedColumn encryptedHash = - GeneratedColumn('encrypted_hash', aliasedName, true, + late final GeneratedColumn pushData = + GeneratedColumn('push_data', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn encryptedHash = + GeneratedColumn('encrypted_hash', aliasedName, true, type: DriftSqlType.blob, requiredDuringInsert: false); late final GeneratedColumn acknowledgeByServerAt = GeneratedColumn('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 Uint8List? pushData; - final Uint8List? encryptedHash; + final i2.Uint8List plaintextContent; + final i2.Uint8List? pushData; + 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(messageId); } - map['plaintext_content'] = Variable(plaintextContent); + map['plaintext_content'] = Variable(plaintextContent); if (!nullToAbsent || pushData != null) { - map['push_data'] = Variable(pushData); + map['push_data'] = Variable(pushData); } if (!nullToAbsent || encryptedHash != null) { - map['encrypted_hash'] = Variable(encryptedHash); + map['encrypted_hash'] = Variable(encryptedHash); } if (!nullToAbsent || acknowledgeByServerAt != null) { map['acknowledge_by_server_at'] = @@ -3628,9 +3630,9 @@ class MessageRetransmissionsData extends DataClass contactId: serializer.fromJson(json['contactId']), messageId: serializer.fromJson(json['messageId']), plaintextContent: - serializer.fromJson(json['plaintextContent']), - pushData: serializer.fromJson(json['pushData']), - encryptedHash: serializer.fromJson(json['encryptedHash']), + serializer.fromJson(json['plaintextContent']), + pushData: serializer.fromJson(json['pushData']), + encryptedHash: serializer.fromJson(json['encryptedHash']), acknowledgeByServerAt: serializer.fromJson(json['acknowledgeByServerAt']), ); @@ -3642,9 +3644,9 @@ class MessageRetransmissionsData extends DataClass 'retransmissionId': serializer.toJson(retransmissionId), 'contactId': serializer.toJson(contactId), 'messageId': serializer.toJson(messageId), - 'plaintextContent': serializer.toJson(plaintextContent), - 'pushData': serializer.toJson(pushData), - 'encryptedHash': serializer.toJson(encryptedHash), + 'plaintextContent': serializer.toJson(plaintextContent), + 'pushData': serializer.toJson(pushData), + 'encryptedHash': serializer.toJson(encryptedHash), 'acknowledgeByServerAt': serializer.toJson(acknowledgeByServerAt), }; @@ -3654,9 +3656,9 @@ class MessageRetransmissionsData extends DataClass {int? retransmissionId, int? contactId, Value messageId = const Value.absent(), - Uint8List? plaintextContent, - Value pushData = const Value.absent(), - Value encryptedHash = const Value.absent(), + i2.Uint8List? plaintextContent, + Value pushData = const Value.absent(), + Value encryptedHash = const Value.absent(), Value acknowledgeByServerAt = const Value.absent()}) => MessageRetransmissionsData( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3733,9 +3735,9 @@ class MessageRetransmissionsCompanion final Value retransmissionId; final Value contactId; final Value messageId; - final Value plaintextContent; - final Value pushData; - final Value encryptedHash; + final Value plaintextContent; + final Value pushData; + final Value encryptedHash; final Value 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? retransmissionId, Expression? contactId, Expression? messageId, - Expression? plaintextContent, - Expression? pushData, - Expression? encryptedHash, + Expression? plaintextContent, + Expression? pushData, + Expression? encryptedHash, Expression? acknowledgeByServerAt, }) { return RawValuesInsertable({ @@ -3781,9 +3783,9 @@ class MessageRetransmissionsCompanion {Value? retransmissionId, Value? contactId, Value? messageId, - Value? plaintextContent, - Value? pushData, - Value? encryptedHash, + Value? plaintextContent, + Value? pushData, + Value? encryptedHash, Value? acknowledgeByServerAt}) { return MessageRetransmissionsCompanion( retransmissionId: retransmissionId ?? this.retransmissionId, @@ -3810,13 +3812,13 @@ class MessageRetransmissionsCompanion map['message_id'] = Variable(messageId.value); } if (plaintextContent.present) { - map['plaintext_content'] = Variable(plaintextContent.value); + map['plaintext_content'] = Variable(plaintextContent.value); } if (pushData.present) { - map['push_data'] = Variable(pushData.value); + map['push_data'] = Variable(pushData.value); } if (encryptedHash.present) { - map['encrypted_hash'] = Variable(encryptedHash.value); + map['encrypted_hash'] = Variable(encryptedHash.value); } if (acknowledgeByServerAt.present) { map['acknowledge_by_server_at'] = diff --git a/test/drift/twonly_database/generated/schema_v15.dart b/test/drift/twonly_database/generated/schema_v15.dart new file mode 100644 index 0000000..7d2e2ce --- /dev/null +++ b/test/drift/twonly_database/generated/schema_v15.dart @@ -0,0 +1,3852 @@ +// 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'; + +class Contacts extends Table with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + Contacts(this.attachedDatabase, [this._alias]); + late final GeneratedColumn userId = GeneratedColumn( + 'user_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn username = GeneratedColumn( + 'username', aliasedName, false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways('UNIQUE')); + late final GeneratedColumn displayName = GeneratedColumn( + 'display_name', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn nickName = GeneratedColumn( + 'nick_name', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn avatarSvg = GeneratedColumn( + 'avatar_svg', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn myAvatarCounter = GeneratedColumn( + 'my_avatar_counter', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const CustomExpression('0')); + late final GeneratedColumn accepted = GeneratedColumn( + 'accepted', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("accepted" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn requested = GeneratedColumn( + 'requested', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("requested" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn blocked = GeneratedColumn( + 'blocked', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("blocked" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn verified = GeneratedColumn( + 'verified', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("verified" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn archived = GeneratedColumn( + 'archived', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("archived" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn pinned = GeneratedColumn( + 'pinned', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("pinned" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn deleted = GeneratedColumn( + 'deleted', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('CHECK ("deleted" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn alsoBestFriend = GeneratedColumn( + 'also_best_friend', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("also_best_friend" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn deleteMessagesAfterXMinutes = + GeneratedColumn( + 'delete_messages_after_x_minutes', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const CustomExpression('1440')); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + late final GeneratedColumn totalMediaCounter = GeneratedColumn( + 'total_media_counter', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const CustomExpression('0')); + late final GeneratedColumn lastMessageSend = + GeneratedColumn('last_message_send', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + late final GeneratedColumn lastMessageReceived = + GeneratedColumn('last_message_received', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + late final GeneratedColumn lastFlameCounterChange = + GeneratedColumn('last_flame_counter_change', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + late final GeneratedColumn lastFlameSync = + GeneratedColumn('last_flame_sync', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + late final GeneratedColumn lastMessageExchange = + GeneratedColumn('last_message_exchange', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + late final GeneratedColumn flameCounter = GeneratedColumn( + 'flame_counter', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const CustomExpression('0')); + @override + List get $columns => [ + userId, + username, + displayName, + nickName, + avatarSvg, + myAvatarCounter, + accepted, + requested, + blocked, + verified, + archived, + pinned, + deleted, + alsoBestFriend, + deleteMessagesAfterXMinutes, + createdAt, + totalMediaCounter, + lastMessageSend, + lastMessageReceived, + lastFlameCounterChange, + lastFlameSync, + lastMessageExchange, + flameCounter + ]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'contacts'; + @override + Set get $primaryKey => {userId}; + @override + ContactsData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return ContactsData( + userId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}user_id'])!, + username: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}username'])!, + displayName: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}display_name']), + nickName: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}nick_name']), + avatarSvg: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}avatar_svg']), + myAvatarCounter: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}my_avatar_counter'])!, + accepted: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}accepted'])!, + requested: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}requested'])!, + blocked: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}blocked'])!, + verified: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}verified'])!, + archived: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}archived'])!, + pinned: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}pinned'])!, + deleted: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}deleted'])!, + alsoBestFriend: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}also_best_friend'])!, + deleteMessagesAfterXMinutes: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}delete_messages_after_x_minutes'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + totalMediaCounter: attachedDatabase.typeMapping.read( + DriftSqlType.int, data['${effectivePrefix}total_media_counter'])!, + lastMessageSend: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, data['${effectivePrefix}last_message_send']), + lastMessageReceived: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_message_received']), + lastFlameCounterChange: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_flame_counter_change']), + lastFlameSync: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, data['${effectivePrefix}last_flame_sync']), + lastMessageExchange: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_message_exchange'])!, + flameCounter: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}flame_counter'])!, + ); + } + + @override + Contacts createAlias(String alias) { + return Contacts(attachedDatabase, alias); + } +} + +class ContactsData extends DataClass implements Insertable { + final int userId; + final String username; + final String? displayName; + final String? nickName; + final String? avatarSvg; + final int myAvatarCounter; + final bool accepted; + final bool requested; + final bool blocked; + final bool verified; + final bool archived; + final bool pinned; + final bool deleted; + final bool alsoBestFriend; + final int deleteMessagesAfterXMinutes; + final DateTime createdAt; + final int totalMediaCounter; + final DateTime? lastMessageSend; + final DateTime? lastMessageReceived; + final DateTime? lastFlameCounterChange; + final DateTime? lastFlameSync; + final DateTime lastMessageExchange; + final int flameCounter; + const ContactsData( + {required this.userId, + required this.username, + this.displayName, + this.nickName, + this.avatarSvg, + required this.myAvatarCounter, + required this.accepted, + required this.requested, + required this.blocked, + required this.verified, + required this.archived, + required this.pinned, + required this.deleted, + required this.alsoBestFriend, + required this.deleteMessagesAfterXMinutes, + required this.createdAt, + required this.totalMediaCounter, + this.lastMessageSend, + this.lastMessageReceived, + this.lastFlameCounterChange, + this.lastFlameSync, + required this.lastMessageExchange, + required this.flameCounter}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['user_id'] = Variable(userId); + map['username'] = Variable(username); + if (!nullToAbsent || displayName != null) { + map['display_name'] = Variable(displayName); + } + if (!nullToAbsent || nickName != null) { + map['nick_name'] = Variable(nickName); + } + if (!nullToAbsent || avatarSvg != null) { + map['avatar_svg'] = Variable(avatarSvg); + } + map['my_avatar_counter'] = Variable(myAvatarCounter); + map['accepted'] = Variable(accepted); + map['requested'] = Variable(requested); + map['blocked'] = Variable(blocked); + map['verified'] = Variable(verified); + map['archived'] = Variable(archived); + map['pinned'] = Variable(pinned); + map['deleted'] = Variable(deleted); + map['also_best_friend'] = Variable(alsoBestFriend); + map['delete_messages_after_x_minutes'] = + Variable(deleteMessagesAfterXMinutes); + map['created_at'] = Variable(createdAt); + map['total_media_counter'] = Variable(totalMediaCounter); + if (!nullToAbsent || lastMessageSend != null) { + map['last_message_send'] = Variable(lastMessageSend); + } + if (!nullToAbsent || lastMessageReceived != null) { + map['last_message_received'] = Variable(lastMessageReceived); + } + if (!nullToAbsent || lastFlameCounterChange != null) { + map['last_flame_counter_change'] = + Variable(lastFlameCounterChange); + } + if (!nullToAbsent || lastFlameSync != null) { + map['last_flame_sync'] = Variable(lastFlameSync); + } + map['last_message_exchange'] = Variable(lastMessageExchange); + map['flame_counter'] = Variable(flameCounter); + return map; + } + + ContactsCompanion toCompanion(bool nullToAbsent) { + return ContactsCompanion( + userId: Value(userId), + username: Value(username), + displayName: displayName == null && nullToAbsent + ? const Value.absent() + : Value(displayName), + nickName: nickName == null && nullToAbsent + ? const Value.absent() + : Value(nickName), + avatarSvg: avatarSvg == null && nullToAbsent + ? const Value.absent() + : Value(avatarSvg), + myAvatarCounter: Value(myAvatarCounter), + accepted: Value(accepted), + requested: Value(requested), + blocked: Value(blocked), + verified: Value(verified), + archived: Value(archived), + pinned: Value(pinned), + deleted: Value(deleted), + alsoBestFriend: Value(alsoBestFriend), + deleteMessagesAfterXMinutes: Value(deleteMessagesAfterXMinutes), + createdAt: Value(createdAt), + totalMediaCounter: Value(totalMediaCounter), + lastMessageSend: lastMessageSend == null && nullToAbsent + ? const Value.absent() + : Value(lastMessageSend), + lastMessageReceived: lastMessageReceived == null && nullToAbsent + ? const Value.absent() + : Value(lastMessageReceived), + lastFlameCounterChange: lastFlameCounterChange == null && nullToAbsent + ? const Value.absent() + : Value(lastFlameCounterChange), + lastFlameSync: lastFlameSync == null && nullToAbsent + ? const Value.absent() + : Value(lastFlameSync), + lastMessageExchange: Value(lastMessageExchange), + flameCounter: Value(flameCounter), + ); + } + + factory ContactsData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return ContactsData( + userId: serializer.fromJson(json['userId']), + username: serializer.fromJson(json['username']), + displayName: serializer.fromJson(json['displayName']), + nickName: serializer.fromJson(json['nickName']), + avatarSvg: serializer.fromJson(json['avatarSvg']), + myAvatarCounter: serializer.fromJson(json['myAvatarCounter']), + accepted: serializer.fromJson(json['accepted']), + requested: serializer.fromJson(json['requested']), + blocked: serializer.fromJson(json['blocked']), + verified: serializer.fromJson(json['verified']), + archived: serializer.fromJson(json['archived']), + pinned: serializer.fromJson(json['pinned']), + deleted: serializer.fromJson(json['deleted']), + alsoBestFriend: serializer.fromJson(json['alsoBestFriend']), + deleteMessagesAfterXMinutes: + serializer.fromJson(json['deleteMessagesAfterXMinutes']), + createdAt: serializer.fromJson(json['createdAt']), + totalMediaCounter: serializer.fromJson(json['totalMediaCounter']), + lastMessageSend: serializer.fromJson(json['lastMessageSend']), + lastMessageReceived: + serializer.fromJson(json['lastMessageReceived']), + lastFlameCounterChange: + serializer.fromJson(json['lastFlameCounterChange']), + lastFlameSync: serializer.fromJson(json['lastFlameSync']), + lastMessageExchange: + serializer.fromJson(json['lastMessageExchange']), + flameCounter: serializer.fromJson(json['flameCounter']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'userId': serializer.toJson(userId), + 'username': serializer.toJson(username), + 'displayName': serializer.toJson(displayName), + 'nickName': serializer.toJson(nickName), + 'avatarSvg': serializer.toJson(avatarSvg), + 'myAvatarCounter': serializer.toJson(myAvatarCounter), + 'accepted': serializer.toJson(accepted), + 'requested': serializer.toJson(requested), + 'blocked': serializer.toJson(blocked), + 'verified': serializer.toJson(verified), + 'archived': serializer.toJson(archived), + 'pinned': serializer.toJson(pinned), + 'deleted': serializer.toJson(deleted), + 'alsoBestFriend': serializer.toJson(alsoBestFriend), + 'deleteMessagesAfterXMinutes': + serializer.toJson(deleteMessagesAfterXMinutes), + 'createdAt': serializer.toJson(createdAt), + 'totalMediaCounter': serializer.toJson(totalMediaCounter), + 'lastMessageSend': serializer.toJson(lastMessageSend), + 'lastMessageReceived': serializer.toJson(lastMessageReceived), + 'lastFlameCounterChange': + serializer.toJson(lastFlameCounterChange), + 'lastFlameSync': serializer.toJson(lastFlameSync), + 'lastMessageExchange': serializer.toJson(lastMessageExchange), + 'flameCounter': serializer.toJson(flameCounter), + }; + } + + ContactsData copyWith( + {int? userId, + String? username, + Value displayName = const Value.absent(), + Value nickName = const Value.absent(), + Value avatarSvg = const Value.absent(), + int? myAvatarCounter, + bool? accepted, + bool? requested, + bool? blocked, + bool? verified, + bool? archived, + bool? pinned, + bool? deleted, + bool? alsoBestFriend, + int? deleteMessagesAfterXMinutes, + DateTime? createdAt, + int? totalMediaCounter, + Value lastMessageSend = const Value.absent(), + Value lastMessageReceived = const Value.absent(), + Value lastFlameCounterChange = const Value.absent(), + Value lastFlameSync = const Value.absent(), + DateTime? lastMessageExchange, + int? flameCounter}) => + ContactsData( + userId: userId ?? this.userId, + username: username ?? this.username, + displayName: displayName.present ? displayName.value : this.displayName, + nickName: nickName.present ? nickName.value : this.nickName, + avatarSvg: avatarSvg.present ? avatarSvg.value : this.avatarSvg, + myAvatarCounter: myAvatarCounter ?? this.myAvatarCounter, + accepted: accepted ?? this.accepted, + requested: requested ?? this.requested, + blocked: blocked ?? this.blocked, + verified: verified ?? this.verified, + archived: archived ?? this.archived, + pinned: pinned ?? this.pinned, + deleted: deleted ?? this.deleted, + alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend, + deleteMessagesAfterXMinutes: + deleteMessagesAfterXMinutes ?? this.deleteMessagesAfterXMinutes, + createdAt: createdAt ?? this.createdAt, + totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter, + lastMessageSend: lastMessageSend.present + ? lastMessageSend.value + : this.lastMessageSend, + lastMessageReceived: lastMessageReceived.present + ? lastMessageReceived.value + : this.lastMessageReceived, + lastFlameCounterChange: lastFlameCounterChange.present + ? lastFlameCounterChange.value + : this.lastFlameCounterChange, + lastFlameSync: + lastFlameSync.present ? lastFlameSync.value : this.lastFlameSync, + lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange, + flameCounter: flameCounter ?? this.flameCounter, + ); + ContactsData copyWithCompanion(ContactsCompanion data) { + return ContactsData( + userId: data.userId.present ? data.userId.value : this.userId, + username: data.username.present ? data.username.value : this.username, + displayName: + data.displayName.present ? data.displayName.value : this.displayName, + nickName: data.nickName.present ? data.nickName.value : this.nickName, + avatarSvg: data.avatarSvg.present ? data.avatarSvg.value : this.avatarSvg, + myAvatarCounter: data.myAvatarCounter.present + ? data.myAvatarCounter.value + : this.myAvatarCounter, + accepted: data.accepted.present ? data.accepted.value : this.accepted, + requested: data.requested.present ? data.requested.value : this.requested, + blocked: data.blocked.present ? data.blocked.value : this.blocked, + verified: data.verified.present ? data.verified.value : this.verified, + archived: data.archived.present ? data.archived.value : this.archived, + pinned: data.pinned.present ? data.pinned.value : this.pinned, + deleted: data.deleted.present ? data.deleted.value : this.deleted, + alsoBestFriend: data.alsoBestFriend.present + ? data.alsoBestFriend.value + : this.alsoBestFriend, + deleteMessagesAfterXMinutes: data.deleteMessagesAfterXMinutes.present + ? data.deleteMessagesAfterXMinutes.value + : this.deleteMessagesAfterXMinutes, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + totalMediaCounter: data.totalMediaCounter.present + ? data.totalMediaCounter.value + : this.totalMediaCounter, + lastMessageSend: data.lastMessageSend.present + ? data.lastMessageSend.value + : this.lastMessageSend, + lastMessageReceived: data.lastMessageReceived.present + ? data.lastMessageReceived.value + : this.lastMessageReceived, + lastFlameCounterChange: data.lastFlameCounterChange.present + ? data.lastFlameCounterChange.value + : this.lastFlameCounterChange, + lastFlameSync: data.lastFlameSync.present + ? data.lastFlameSync.value + : this.lastFlameSync, + lastMessageExchange: data.lastMessageExchange.present + ? data.lastMessageExchange.value + : this.lastMessageExchange, + flameCounter: data.flameCounter.present + ? data.flameCounter.value + : this.flameCounter, + ); + } + + @override + String toString() { + return (StringBuffer('ContactsData(') + ..write('userId: $userId, ') + ..write('username: $username, ') + ..write('displayName: $displayName, ') + ..write('nickName: $nickName, ') + ..write('avatarSvg: $avatarSvg, ') + ..write('myAvatarCounter: $myAvatarCounter, ') + ..write('accepted: $accepted, ') + ..write('requested: $requested, ') + ..write('blocked: $blocked, ') + ..write('verified: $verified, ') + ..write('archived: $archived, ') + ..write('pinned: $pinned, ') + ..write('deleted: $deleted, ') + ..write('alsoBestFriend: $alsoBestFriend, ') + ..write('deleteMessagesAfterXMinutes: $deleteMessagesAfterXMinutes, ') + ..write('createdAt: $createdAt, ') + ..write('totalMediaCounter: $totalMediaCounter, ') + ..write('lastMessageSend: $lastMessageSend, ') + ..write('lastMessageReceived: $lastMessageReceived, ') + ..write('lastFlameCounterChange: $lastFlameCounterChange, ') + ..write('lastFlameSync: $lastFlameSync, ') + ..write('lastMessageExchange: $lastMessageExchange, ') + ..write('flameCounter: $flameCounter') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hashAll([ + userId, + username, + displayName, + nickName, + avatarSvg, + myAvatarCounter, + accepted, + requested, + blocked, + verified, + archived, + pinned, + deleted, + alsoBestFriend, + deleteMessagesAfterXMinutes, + createdAt, + totalMediaCounter, + lastMessageSend, + lastMessageReceived, + lastFlameCounterChange, + lastFlameSync, + lastMessageExchange, + flameCounter + ]); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is ContactsData && + other.userId == this.userId && + other.username == this.username && + other.displayName == this.displayName && + other.nickName == this.nickName && + other.avatarSvg == this.avatarSvg && + other.myAvatarCounter == this.myAvatarCounter && + other.accepted == this.accepted && + other.requested == this.requested && + other.blocked == this.blocked && + other.verified == this.verified && + other.archived == this.archived && + other.pinned == this.pinned && + other.deleted == this.deleted && + other.alsoBestFriend == this.alsoBestFriend && + other.deleteMessagesAfterXMinutes == + this.deleteMessagesAfterXMinutes && + other.createdAt == this.createdAt && + other.totalMediaCounter == this.totalMediaCounter && + other.lastMessageSend == this.lastMessageSend && + other.lastMessageReceived == this.lastMessageReceived && + other.lastFlameCounterChange == this.lastFlameCounterChange && + other.lastFlameSync == this.lastFlameSync && + other.lastMessageExchange == this.lastMessageExchange && + other.flameCounter == this.flameCounter); +} + +class ContactsCompanion extends UpdateCompanion { + final Value userId; + final Value username; + final Value displayName; + final Value nickName; + final Value avatarSvg; + final Value myAvatarCounter; + final Value accepted; + final Value requested; + final Value blocked; + final Value verified; + final Value archived; + final Value pinned; + final Value deleted; + final Value alsoBestFriend; + final Value deleteMessagesAfterXMinutes; + final Value createdAt; + final Value totalMediaCounter; + final Value lastMessageSend; + final Value lastMessageReceived; + final Value lastFlameCounterChange; + final Value lastFlameSync; + final Value lastMessageExchange; + final Value flameCounter; + const ContactsCompanion({ + this.userId = const Value.absent(), + this.username = const Value.absent(), + this.displayName = const Value.absent(), + this.nickName = const Value.absent(), + this.avatarSvg = const Value.absent(), + this.myAvatarCounter = const Value.absent(), + this.accepted = const Value.absent(), + this.requested = const Value.absent(), + this.blocked = const Value.absent(), + this.verified = const Value.absent(), + this.archived = const Value.absent(), + this.pinned = const Value.absent(), + this.deleted = const Value.absent(), + this.alsoBestFriend = const Value.absent(), + this.deleteMessagesAfterXMinutes = const Value.absent(), + this.createdAt = const Value.absent(), + this.totalMediaCounter = const Value.absent(), + this.lastMessageSend = const Value.absent(), + this.lastMessageReceived = const Value.absent(), + this.lastFlameCounterChange = const Value.absent(), + this.lastFlameSync = const Value.absent(), + this.lastMessageExchange = const Value.absent(), + this.flameCounter = const Value.absent(), + }); + ContactsCompanion.insert({ + this.userId = const Value.absent(), + required String username, + this.displayName = const Value.absent(), + this.nickName = const Value.absent(), + this.avatarSvg = const Value.absent(), + this.myAvatarCounter = const Value.absent(), + this.accepted = const Value.absent(), + this.requested = const Value.absent(), + this.blocked = const Value.absent(), + this.verified = const Value.absent(), + this.archived = const Value.absent(), + this.pinned = const Value.absent(), + this.deleted = const Value.absent(), + this.alsoBestFriend = const Value.absent(), + this.deleteMessagesAfterXMinutes = const Value.absent(), + this.createdAt = const Value.absent(), + this.totalMediaCounter = const Value.absent(), + this.lastMessageSend = const Value.absent(), + this.lastMessageReceived = const Value.absent(), + this.lastFlameCounterChange = const Value.absent(), + this.lastFlameSync = const Value.absent(), + this.lastMessageExchange = const Value.absent(), + this.flameCounter = const Value.absent(), + }) : username = Value(username); + static Insertable custom({ + Expression? userId, + Expression? username, + Expression? displayName, + Expression? nickName, + Expression? avatarSvg, + Expression? myAvatarCounter, + Expression? accepted, + Expression? requested, + Expression? blocked, + Expression? verified, + Expression? archived, + Expression? pinned, + Expression? deleted, + Expression? alsoBestFriend, + Expression? deleteMessagesAfterXMinutes, + Expression? createdAt, + Expression? totalMediaCounter, + Expression? lastMessageSend, + Expression? lastMessageReceived, + Expression? lastFlameCounterChange, + Expression? lastFlameSync, + Expression? lastMessageExchange, + Expression? flameCounter, + }) { + return RawValuesInsertable({ + if (userId != null) 'user_id': userId, + if (username != null) 'username': username, + if (displayName != null) 'display_name': displayName, + if (nickName != null) 'nick_name': nickName, + if (avatarSvg != null) 'avatar_svg': avatarSvg, + if (myAvatarCounter != null) 'my_avatar_counter': myAvatarCounter, + if (accepted != null) 'accepted': accepted, + if (requested != null) 'requested': requested, + if (blocked != null) 'blocked': blocked, + if (verified != null) 'verified': verified, + if (archived != null) 'archived': archived, + if (pinned != null) 'pinned': pinned, + if (deleted != null) 'deleted': deleted, + if (alsoBestFriend != null) 'also_best_friend': alsoBestFriend, + if (deleteMessagesAfterXMinutes != null) + 'delete_messages_after_x_minutes': deleteMessagesAfterXMinutes, + if (createdAt != null) 'created_at': createdAt, + if (totalMediaCounter != null) 'total_media_counter': totalMediaCounter, + if (lastMessageSend != null) 'last_message_send': lastMessageSend, + if (lastMessageReceived != null) + 'last_message_received': lastMessageReceived, + if (lastFlameCounterChange != null) + 'last_flame_counter_change': lastFlameCounterChange, + if (lastFlameSync != null) 'last_flame_sync': lastFlameSync, + if (lastMessageExchange != null) + 'last_message_exchange': lastMessageExchange, + if (flameCounter != null) 'flame_counter': flameCounter, + }); + } + + ContactsCompanion copyWith( + {Value? userId, + Value? username, + Value? displayName, + Value? nickName, + Value? avatarSvg, + Value? myAvatarCounter, + Value? accepted, + Value? requested, + Value? blocked, + Value? verified, + Value? archived, + Value? pinned, + Value? deleted, + Value? alsoBestFriend, + Value? deleteMessagesAfterXMinutes, + Value? createdAt, + Value? totalMediaCounter, + Value? lastMessageSend, + Value? lastMessageReceived, + Value? lastFlameCounterChange, + Value? lastFlameSync, + Value? lastMessageExchange, + Value? flameCounter}) { + return ContactsCompanion( + userId: userId ?? this.userId, + username: username ?? this.username, + displayName: displayName ?? this.displayName, + nickName: nickName ?? this.nickName, + avatarSvg: avatarSvg ?? this.avatarSvg, + myAvatarCounter: myAvatarCounter ?? this.myAvatarCounter, + accepted: accepted ?? this.accepted, + requested: requested ?? this.requested, + blocked: blocked ?? this.blocked, + verified: verified ?? this.verified, + archived: archived ?? this.archived, + pinned: pinned ?? this.pinned, + deleted: deleted ?? this.deleted, + alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend, + deleteMessagesAfterXMinutes: + deleteMessagesAfterXMinutes ?? this.deleteMessagesAfterXMinutes, + createdAt: createdAt ?? this.createdAt, + totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter, + lastMessageSend: lastMessageSend ?? this.lastMessageSend, + lastMessageReceived: lastMessageReceived ?? this.lastMessageReceived, + lastFlameCounterChange: + lastFlameCounterChange ?? this.lastFlameCounterChange, + lastFlameSync: lastFlameSync ?? this.lastFlameSync, + lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange, + flameCounter: flameCounter ?? this.flameCounter, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (userId.present) { + map['user_id'] = Variable(userId.value); + } + if (username.present) { + map['username'] = Variable(username.value); + } + if (displayName.present) { + map['display_name'] = Variable(displayName.value); + } + if (nickName.present) { + map['nick_name'] = Variable(nickName.value); + } + if (avatarSvg.present) { + map['avatar_svg'] = Variable(avatarSvg.value); + } + if (myAvatarCounter.present) { + map['my_avatar_counter'] = Variable(myAvatarCounter.value); + } + if (accepted.present) { + map['accepted'] = Variable(accepted.value); + } + if (requested.present) { + map['requested'] = Variable(requested.value); + } + if (blocked.present) { + map['blocked'] = Variable(blocked.value); + } + if (verified.present) { + map['verified'] = Variable(verified.value); + } + if (archived.present) { + map['archived'] = Variable(archived.value); + } + if (pinned.present) { + map['pinned'] = Variable(pinned.value); + } + if (deleted.present) { + map['deleted'] = Variable(deleted.value); + } + if (alsoBestFriend.present) { + map['also_best_friend'] = Variable(alsoBestFriend.value); + } + if (deleteMessagesAfterXMinutes.present) { + map['delete_messages_after_x_minutes'] = + Variable(deleteMessagesAfterXMinutes.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + if (totalMediaCounter.present) { + map['total_media_counter'] = Variable(totalMediaCounter.value); + } + if (lastMessageSend.present) { + map['last_message_send'] = Variable(lastMessageSend.value); + } + if (lastMessageReceived.present) { + map['last_message_received'] = + Variable(lastMessageReceived.value); + } + if (lastFlameCounterChange.present) { + map['last_flame_counter_change'] = + Variable(lastFlameCounterChange.value); + } + if (lastFlameSync.present) { + map['last_flame_sync'] = Variable(lastFlameSync.value); + } + if (lastMessageExchange.present) { + map['last_message_exchange'] = + Variable(lastMessageExchange.value); + } + if (flameCounter.present) { + map['flame_counter'] = Variable(flameCounter.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('ContactsCompanion(') + ..write('userId: $userId, ') + ..write('username: $username, ') + ..write('displayName: $displayName, ') + ..write('nickName: $nickName, ') + ..write('avatarSvg: $avatarSvg, ') + ..write('myAvatarCounter: $myAvatarCounter, ') + ..write('accepted: $accepted, ') + ..write('requested: $requested, ') + ..write('blocked: $blocked, ') + ..write('verified: $verified, ') + ..write('archived: $archived, ') + ..write('pinned: $pinned, ') + ..write('deleted: $deleted, ') + ..write('alsoBestFriend: $alsoBestFriend, ') + ..write('deleteMessagesAfterXMinutes: $deleteMessagesAfterXMinutes, ') + ..write('createdAt: $createdAt, ') + ..write('totalMediaCounter: $totalMediaCounter, ') + ..write('lastMessageSend: $lastMessageSend, ') + ..write('lastMessageReceived: $lastMessageReceived, ') + ..write('lastFlameCounterChange: $lastFlameCounterChange, ') + ..write('lastFlameSync: $lastFlameSync, ') + ..write('lastMessageExchange: $lastMessageExchange, ') + ..write('flameCounter: $flameCounter') + ..write(')')) + .toString(); + } +} + +class Messages extends Table with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + Messages(this.attachedDatabase, [this._alias]); + late final GeneratedColumn contactId = GeneratedColumn( + 'contact_id', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: true, + defaultConstraints: + GeneratedColumn.constraintIsAlways('REFERENCES contacts (user_id)')); + late final GeneratedColumn messageId = GeneratedColumn( + 'message_id', aliasedName, false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + late final GeneratedColumn messageOtherId = GeneratedColumn( + 'message_other_id', aliasedName, true, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn mediaUploadId = GeneratedColumn( + 'media_upload_id', aliasedName, true, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn mediaDownloadId = GeneratedColumn( + 'media_download_id', aliasedName, true, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn responseToMessageId = GeneratedColumn( + 'response_to_message_id', aliasedName, true, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn responseToOtherMessageId = + GeneratedColumn('response_to_other_message_id', aliasedName, true, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn acknowledgeByUser = GeneratedColumn( + 'acknowledge_by_user', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("acknowledge_by_user" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn mediaStored = GeneratedColumn( + 'media_stored', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("media_stored" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn downloadState = GeneratedColumn( + 'download_state', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultValue: const CustomExpression('2')); + late final GeneratedColumn acknowledgeByServer = GeneratedColumn( + 'acknowledge_by_server', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("acknowledge_by_server" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn errorWhileSending = GeneratedColumn( + 'error_while_sending', aliasedName, false, + type: DriftSqlType.bool, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'CHECK ("error_while_sending" IN (0, 1))'), + defaultValue: const CustomExpression('0')); + late final GeneratedColumn mediaRetransmissionState = + GeneratedColumn('media_retransmission_state', aliasedName, false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const CustomExpression('\'none\'')); + late final GeneratedColumn kind = GeneratedColumn( + 'kind', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true); + late final GeneratedColumn contentJson = GeneratedColumn( + 'content_json', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn openedAt = GeneratedColumn( + 'opened_at', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + late final GeneratedColumn sendAt = GeneratedColumn( + 'send_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + late final GeneratedColumn updatedAt = GeneratedColumn( + 'updated_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => [ + contactId, + messageId, + messageOtherId, + mediaUploadId, + mediaDownloadId, + responseToMessageId, + responseToOtherMessageId, + acknowledgeByUser, + mediaStored, + downloadState, + acknowledgeByServer, + errorWhileSending, + mediaRetransmissionState, + kind, + contentJson, + openedAt, + sendAt, + updatedAt + ]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'messages'; + @override + Set get $primaryKey => {messageId}; + @override + MessagesData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return MessagesData( + contactId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}contact_id'])!, + messageId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}message_id'])!, + messageOtherId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}message_other_id']), + mediaUploadId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}media_upload_id']), + mediaDownloadId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}media_download_id']), + responseToMessageId: attachedDatabase.typeMapping.read( + DriftSqlType.int, data['${effectivePrefix}response_to_message_id']), + responseToOtherMessageId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}response_to_other_message_id']), + acknowledgeByUser: attachedDatabase.typeMapping.read( + DriftSqlType.bool, data['${effectivePrefix}acknowledge_by_user'])!, + mediaStored: attachedDatabase.typeMapping + .read(DriftSqlType.bool, data['${effectivePrefix}media_stored'])!, + downloadState: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}download_state'])!, + acknowledgeByServer: attachedDatabase.typeMapping.read( + DriftSqlType.bool, data['${effectivePrefix}acknowledge_by_server'])!, + errorWhileSending: attachedDatabase.typeMapping.read( + DriftSqlType.bool, data['${effectivePrefix}error_while_sending'])!, + mediaRetransmissionState: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}media_retransmission_state'])!, + kind: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}kind'])!, + contentJson: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}content_json']), + openedAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}opened_at']), + sendAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}send_at'])!, + updatedAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + ); + } + + @override + Messages createAlias(String alias) { + return Messages(attachedDatabase, alias); + } +} + +class MessagesData extends DataClass implements Insertable { + final int contactId; + final int messageId; + final int? messageOtherId; + final int? mediaUploadId; + final int? mediaDownloadId; + final int? responseToMessageId; + final int? responseToOtherMessageId; + final bool acknowledgeByUser; + final bool mediaStored; + final int downloadState; + final bool acknowledgeByServer; + final bool errorWhileSending; + final String mediaRetransmissionState; + final String kind; + final String? contentJson; + final DateTime? openedAt; + final DateTime sendAt; + final DateTime updatedAt; + const MessagesData( + {required this.contactId, + required this.messageId, + this.messageOtherId, + this.mediaUploadId, + this.mediaDownloadId, + this.responseToMessageId, + this.responseToOtherMessageId, + required this.acknowledgeByUser, + required this.mediaStored, + required this.downloadState, + required this.acknowledgeByServer, + required this.errorWhileSending, + required this.mediaRetransmissionState, + required this.kind, + this.contentJson, + this.openedAt, + required this.sendAt, + required this.updatedAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['contact_id'] = Variable(contactId); + map['message_id'] = Variable(messageId); + if (!nullToAbsent || messageOtherId != null) { + map['message_other_id'] = Variable(messageOtherId); + } + if (!nullToAbsent || mediaUploadId != null) { + map['media_upload_id'] = Variable(mediaUploadId); + } + if (!nullToAbsent || mediaDownloadId != null) { + map['media_download_id'] = Variable(mediaDownloadId); + } + if (!nullToAbsent || responseToMessageId != null) { + map['response_to_message_id'] = Variable(responseToMessageId); + } + if (!nullToAbsent || responseToOtherMessageId != null) { + map['response_to_other_message_id'] = + Variable(responseToOtherMessageId); + } + map['acknowledge_by_user'] = Variable(acknowledgeByUser); + map['media_stored'] = Variable(mediaStored); + map['download_state'] = Variable(downloadState); + map['acknowledge_by_server'] = Variable(acknowledgeByServer); + map['error_while_sending'] = Variable(errorWhileSending); + map['media_retransmission_state'] = + Variable(mediaRetransmissionState); + map['kind'] = Variable(kind); + if (!nullToAbsent || contentJson != null) { + map['content_json'] = Variable(contentJson); + } + if (!nullToAbsent || openedAt != null) { + map['opened_at'] = Variable(openedAt); + } + map['send_at'] = Variable(sendAt); + map['updated_at'] = Variable(updatedAt); + return map; + } + + MessagesCompanion toCompanion(bool nullToAbsent) { + return MessagesCompanion( + contactId: Value(contactId), + messageId: Value(messageId), + messageOtherId: messageOtherId == null && nullToAbsent + ? const Value.absent() + : Value(messageOtherId), + mediaUploadId: mediaUploadId == null && nullToAbsent + ? const Value.absent() + : Value(mediaUploadId), + mediaDownloadId: mediaDownloadId == null && nullToAbsent + ? const Value.absent() + : Value(mediaDownloadId), + responseToMessageId: responseToMessageId == null && nullToAbsent + ? const Value.absent() + : Value(responseToMessageId), + responseToOtherMessageId: responseToOtherMessageId == null && nullToAbsent + ? const Value.absent() + : Value(responseToOtherMessageId), + acknowledgeByUser: Value(acknowledgeByUser), + mediaStored: Value(mediaStored), + downloadState: Value(downloadState), + acknowledgeByServer: Value(acknowledgeByServer), + errorWhileSending: Value(errorWhileSending), + mediaRetransmissionState: Value(mediaRetransmissionState), + kind: Value(kind), + contentJson: contentJson == null && nullToAbsent + ? const Value.absent() + : Value(contentJson), + openedAt: openedAt == null && nullToAbsent + ? const Value.absent() + : Value(openedAt), + sendAt: Value(sendAt), + updatedAt: Value(updatedAt), + ); + } + + factory MessagesData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return MessagesData( + contactId: serializer.fromJson(json['contactId']), + messageId: serializer.fromJson(json['messageId']), + messageOtherId: serializer.fromJson(json['messageOtherId']), + mediaUploadId: serializer.fromJson(json['mediaUploadId']), + mediaDownloadId: serializer.fromJson(json['mediaDownloadId']), + responseToMessageId: + serializer.fromJson(json['responseToMessageId']), + responseToOtherMessageId: + serializer.fromJson(json['responseToOtherMessageId']), + acknowledgeByUser: serializer.fromJson(json['acknowledgeByUser']), + mediaStored: serializer.fromJson(json['mediaStored']), + downloadState: serializer.fromJson(json['downloadState']), + acknowledgeByServer: + serializer.fromJson(json['acknowledgeByServer']), + errorWhileSending: serializer.fromJson(json['errorWhileSending']), + mediaRetransmissionState: + serializer.fromJson(json['mediaRetransmissionState']), + kind: serializer.fromJson(json['kind']), + contentJson: serializer.fromJson(json['contentJson']), + openedAt: serializer.fromJson(json['openedAt']), + sendAt: serializer.fromJson(json['sendAt']), + updatedAt: serializer.fromJson(json['updatedAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'contactId': serializer.toJson(contactId), + 'messageId': serializer.toJson(messageId), + 'messageOtherId': serializer.toJson(messageOtherId), + 'mediaUploadId': serializer.toJson(mediaUploadId), + 'mediaDownloadId': serializer.toJson(mediaDownloadId), + 'responseToMessageId': serializer.toJson(responseToMessageId), + 'responseToOtherMessageId': + serializer.toJson(responseToOtherMessageId), + 'acknowledgeByUser': serializer.toJson(acknowledgeByUser), + 'mediaStored': serializer.toJson(mediaStored), + 'downloadState': serializer.toJson(downloadState), + 'acknowledgeByServer': serializer.toJson(acknowledgeByServer), + 'errorWhileSending': serializer.toJson(errorWhileSending), + 'mediaRetransmissionState': + serializer.toJson(mediaRetransmissionState), + 'kind': serializer.toJson(kind), + 'contentJson': serializer.toJson(contentJson), + 'openedAt': serializer.toJson(openedAt), + 'sendAt': serializer.toJson(sendAt), + 'updatedAt': serializer.toJson(updatedAt), + }; + } + + MessagesData copyWith( + {int? contactId, + int? messageId, + Value messageOtherId = const Value.absent(), + Value mediaUploadId = const Value.absent(), + Value mediaDownloadId = const Value.absent(), + Value responseToMessageId = const Value.absent(), + Value responseToOtherMessageId = const Value.absent(), + bool? acknowledgeByUser, + bool? mediaStored, + int? downloadState, + bool? acknowledgeByServer, + bool? errorWhileSending, + String? mediaRetransmissionState, + String? kind, + Value contentJson = const Value.absent(), + Value openedAt = const Value.absent(), + DateTime? sendAt, + DateTime? updatedAt}) => + MessagesData( + contactId: contactId ?? this.contactId, + messageId: messageId ?? this.messageId, + messageOtherId: + messageOtherId.present ? messageOtherId.value : this.messageOtherId, + mediaUploadId: + mediaUploadId.present ? mediaUploadId.value : this.mediaUploadId, + mediaDownloadId: mediaDownloadId.present + ? mediaDownloadId.value + : this.mediaDownloadId, + responseToMessageId: responseToMessageId.present + ? responseToMessageId.value + : this.responseToMessageId, + responseToOtherMessageId: responseToOtherMessageId.present + ? responseToOtherMessageId.value + : this.responseToOtherMessageId, + acknowledgeByUser: acknowledgeByUser ?? this.acknowledgeByUser, + mediaStored: mediaStored ?? this.mediaStored, + 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, + sendAt: sendAt ?? this.sendAt, + updatedAt: updatedAt ?? this.updatedAt, + ); + MessagesData copyWithCompanion(MessagesCompanion data) { + return MessagesData( + contactId: data.contactId.present ? data.contactId.value : this.contactId, + messageId: data.messageId.present ? data.messageId.value : this.messageId, + messageOtherId: data.messageOtherId.present + ? data.messageOtherId.value + : this.messageOtherId, + mediaUploadId: data.mediaUploadId.present + ? data.mediaUploadId.value + : this.mediaUploadId, + mediaDownloadId: data.mediaDownloadId.present + ? data.mediaDownloadId.value + : this.mediaDownloadId, + responseToMessageId: data.responseToMessageId.present + ? data.responseToMessageId.value + : this.responseToMessageId, + responseToOtherMessageId: data.responseToOtherMessageId.present + ? data.responseToOtherMessageId.value + : this.responseToOtherMessageId, + acknowledgeByUser: data.acknowledgeByUser.present + ? data.acknowledgeByUser.value + : this.acknowledgeByUser, + mediaStored: + data.mediaStored.present ? data.mediaStored.value : this.mediaStored, + downloadState: data.downloadState.present + ? data.downloadState.value + : this.downloadState, + acknowledgeByServer: data.acknowledgeByServer.present + ? data.acknowledgeByServer.value + : this.acknowledgeByServer, + 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, + openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt, + sendAt: data.sendAt.present ? data.sendAt.value : this.sendAt, + updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt, + ); + } + + @override + String toString() { + return (StringBuffer('MessagesData(') + ..write('contactId: $contactId, ') + ..write('messageId: $messageId, ') + ..write('messageOtherId: $messageOtherId, ') + ..write('mediaUploadId: $mediaUploadId, ') + ..write('mediaDownloadId: $mediaDownloadId, ') + ..write('responseToMessageId: $responseToMessageId, ') + ..write('responseToOtherMessageId: $responseToOtherMessageId, ') + ..write('acknowledgeByUser: $acknowledgeByUser, ') + ..write('mediaStored: $mediaStored, ') + ..write('downloadState: $downloadState, ') + ..write('acknowledgeByServer: $acknowledgeByServer, ') + ..write('errorWhileSending: $errorWhileSending, ') + ..write('mediaRetransmissionState: $mediaRetransmissionState, ') + ..write('kind: $kind, ') + ..write('contentJson: $contentJson, ') + ..write('openedAt: $openedAt, ') + ..write('sendAt: $sendAt, ') + ..write('updatedAt: $updatedAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + contactId, + messageId, + messageOtherId, + mediaUploadId, + mediaDownloadId, + responseToMessageId, + responseToOtherMessageId, + acknowledgeByUser, + mediaStored, + downloadState, + acknowledgeByServer, + errorWhileSending, + mediaRetransmissionState, + kind, + contentJson, + openedAt, + sendAt, + updatedAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is MessagesData && + other.contactId == this.contactId && + other.messageId == this.messageId && + other.messageOtherId == this.messageOtherId && + other.mediaUploadId == this.mediaUploadId && + other.mediaDownloadId == this.mediaDownloadId && + other.responseToMessageId == this.responseToMessageId && + other.responseToOtherMessageId == this.responseToOtherMessageId && + other.acknowledgeByUser == this.acknowledgeByUser && + other.mediaStored == this.mediaStored && + 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 && + other.sendAt == this.sendAt && + other.updatedAt == this.updatedAt); +} + +class MessagesCompanion extends UpdateCompanion { + final Value contactId; + final Value messageId; + final Value messageOtherId; + final Value mediaUploadId; + final Value mediaDownloadId; + final Value responseToMessageId; + final Value responseToOtherMessageId; + final Value acknowledgeByUser; + final Value mediaStored; + final Value downloadState; + final Value acknowledgeByServer; + final Value errorWhileSending; + final Value mediaRetransmissionState; + final Value kind; + final Value contentJson; + final Value openedAt; + final Value sendAt; + final Value updatedAt; + const MessagesCompanion({ + this.contactId = const Value.absent(), + this.messageId = const Value.absent(), + this.messageOtherId = const Value.absent(), + this.mediaUploadId = const Value.absent(), + this.mediaDownloadId = const Value.absent(), + this.responseToMessageId = const Value.absent(), + this.responseToOtherMessageId = const Value.absent(), + this.acknowledgeByUser = const Value.absent(), + this.mediaStored = const Value.absent(), + 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(), + this.sendAt = const Value.absent(), + this.updatedAt = const Value.absent(), + }); + MessagesCompanion.insert({ + required int contactId, + this.messageId = const Value.absent(), + this.messageOtherId = const Value.absent(), + this.mediaUploadId = const Value.absent(), + this.mediaDownloadId = const Value.absent(), + this.responseToMessageId = const Value.absent(), + this.responseToOtherMessageId = const Value.absent(), + this.acknowledgeByUser = const Value.absent(), + this.mediaStored = const Value.absent(), + this.downloadState = const Value.absent(), + this.acknowledgeByServer = const Value.absent(), + this.errorWhileSending = const Value.absent(), + this.mediaRetransmissionState = const Value.absent(), + required String kind, + this.contentJson = const Value.absent(), + this.openedAt = const Value.absent(), + this.sendAt = const Value.absent(), + this.updatedAt = const Value.absent(), + }) : contactId = Value(contactId), + kind = Value(kind); + static Insertable custom({ + Expression? contactId, + Expression? messageId, + Expression? messageOtherId, + Expression? mediaUploadId, + Expression? mediaDownloadId, + Expression? responseToMessageId, + Expression? responseToOtherMessageId, + Expression? acknowledgeByUser, + Expression? mediaStored, + Expression? downloadState, + Expression? acknowledgeByServer, + Expression? errorWhileSending, + Expression? mediaRetransmissionState, + Expression? kind, + Expression? contentJson, + Expression? openedAt, + Expression? sendAt, + Expression? updatedAt, + }) { + return RawValuesInsertable({ + if (contactId != null) 'contact_id': contactId, + if (messageId != null) 'message_id': messageId, + if (messageOtherId != null) 'message_other_id': messageOtherId, + if (mediaUploadId != null) 'media_upload_id': mediaUploadId, + if (mediaDownloadId != null) 'media_download_id': mediaDownloadId, + if (responseToMessageId != null) + 'response_to_message_id': responseToMessageId, + if (responseToOtherMessageId != null) + 'response_to_other_message_id': responseToOtherMessageId, + if (acknowledgeByUser != null) 'acknowledge_by_user': acknowledgeByUser, + if (mediaStored != null) 'media_stored': mediaStored, + if (downloadState != null) 'download_state': downloadState, + 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, + if (sendAt != null) 'send_at': sendAt, + if (updatedAt != null) 'updated_at': updatedAt, + }); + } + + MessagesCompanion copyWith( + {Value? contactId, + Value? messageId, + Value? messageOtherId, + Value? mediaUploadId, + Value? mediaDownloadId, + Value? responseToMessageId, + Value? responseToOtherMessageId, + Value? acknowledgeByUser, + Value? mediaStored, + Value? downloadState, + Value? acknowledgeByServer, + Value? errorWhileSending, + Value? mediaRetransmissionState, + Value? kind, + Value? contentJson, + Value? openedAt, + Value? sendAt, + Value? updatedAt}) { + return MessagesCompanion( + contactId: contactId ?? this.contactId, + messageId: messageId ?? this.messageId, + messageOtherId: messageOtherId ?? this.messageOtherId, + mediaUploadId: mediaUploadId ?? this.mediaUploadId, + mediaDownloadId: mediaDownloadId ?? this.mediaDownloadId, + responseToMessageId: responseToMessageId ?? this.responseToMessageId, + responseToOtherMessageId: + responseToOtherMessageId ?? this.responseToOtherMessageId, + acknowledgeByUser: acknowledgeByUser ?? this.acknowledgeByUser, + mediaStored: mediaStored ?? this.mediaStored, + 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, + sendAt: sendAt ?? this.sendAt, + updatedAt: updatedAt ?? this.updatedAt, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (contactId.present) { + map['contact_id'] = Variable(contactId.value); + } + if (messageId.present) { + map['message_id'] = Variable(messageId.value); + } + if (messageOtherId.present) { + map['message_other_id'] = Variable(messageOtherId.value); + } + if (mediaUploadId.present) { + map['media_upload_id'] = Variable(mediaUploadId.value); + } + if (mediaDownloadId.present) { + map['media_download_id'] = Variable(mediaDownloadId.value); + } + if (responseToMessageId.present) { + map['response_to_message_id'] = Variable(responseToMessageId.value); + } + if (responseToOtherMessageId.present) { + map['response_to_other_message_id'] = + Variable(responseToOtherMessageId.value); + } + if (acknowledgeByUser.present) { + map['acknowledge_by_user'] = Variable(acknowledgeByUser.value); + } + if (mediaStored.present) { + map['media_stored'] = Variable(mediaStored.value); + } + if (downloadState.present) { + map['download_state'] = Variable(downloadState.value); + } + if (acknowledgeByServer.present) { + map['acknowledge_by_server'] = Variable(acknowledgeByServer.value); + } + if (errorWhileSending.present) { + map['error_while_sending'] = Variable(errorWhileSending.value); + } + if (mediaRetransmissionState.present) { + map['media_retransmission_state'] = + Variable(mediaRetransmissionState.value); + } + if (kind.present) { + map['kind'] = Variable(kind.value); + } + if (contentJson.present) { + map['content_json'] = Variable(contentJson.value); + } + if (openedAt.present) { + map['opened_at'] = Variable(openedAt.value); + } + if (sendAt.present) { + map['send_at'] = Variable(sendAt.value); + } + if (updatedAt.present) { + map['updated_at'] = Variable(updatedAt.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('MessagesCompanion(') + ..write('contactId: $contactId, ') + ..write('messageId: $messageId, ') + ..write('messageOtherId: $messageOtherId, ') + ..write('mediaUploadId: $mediaUploadId, ') + ..write('mediaDownloadId: $mediaDownloadId, ') + ..write('responseToMessageId: $responseToMessageId, ') + ..write('responseToOtherMessageId: $responseToOtherMessageId, ') + ..write('acknowledgeByUser: $acknowledgeByUser, ') + ..write('mediaStored: $mediaStored, ') + ..write('downloadState: $downloadState, ') + ..write('acknowledgeByServer: $acknowledgeByServer, ') + ..write('errorWhileSending: $errorWhileSending, ') + ..write('mediaRetransmissionState: $mediaRetransmissionState, ') + ..write('kind: $kind, ') + ..write('contentJson: $contentJson, ') + ..write('openedAt: $openedAt, ') + ..write('sendAt: $sendAt, ') + ..write('updatedAt: $updatedAt') + ..write(')')) + .toString(); + } +} + +class MediaUploads extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + MediaUploads(this.attachedDatabase, [this._alias]); + late final GeneratedColumn mediaUploadId = GeneratedColumn( + 'media_upload_id', aliasedName, false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + late final GeneratedColumn state = GeneratedColumn( + 'state', aliasedName, false, + type: DriftSqlType.string, + requiredDuringInsert: false, + defaultValue: const CustomExpression('\'pending\'')); + late final GeneratedColumn metadata = GeneratedColumn( + 'metadata', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn messageIds = GeneratedColumn( + 'message_ids', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + late final GeneratedColumn encryptionData = GeneratedColumn( + 'encryption_data', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); + @override + List get $columns => + [mediaUploadId, state, metadata, messageIds, encryptionData]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'media_uploads'; + @override + Set get $primaryKey => {mediaUploadId}; + @override + MediaUploadsData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return MediaUploadsData( + mediaUploadId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}media_upload_id'])!, + state: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}state'])!, + metadata: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}metadata']), + messageIds: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}message_ids']), + encryptionData: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}encryption_data']), + ); + } + + @override + MediaUploads createAlias(String alias) { + return MediaUploads(attachedDatabase, alias); + } +} + +class MediaUploadsData extends DataClass + implements Insertable { + final int mediaUploadId; + final String state; + final String? metadata; + final String? messageIds; + final String? encryptionData; + const MediaUploadsData( + {required this.mediaUploadId, + required this.state, + this.metadata, + this.messageIds, + this.encryptionData}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['media_upload_id'] = Variable(mediaUploadId); + map['state'] = Variable(state); + if (!nullToAbsent || metadata != null) { + map['metadata'] = Variable(metadata); + } + if (!nullToAbsent || messageIds != null) { + map['message_ids'] = Variable(messageIds); + } + if (!nullToAbsent || encryptionData != null) { + map['encryption_data'] = Variable(encryptionData); + } + return map; + } + + MediaUploadsCompanion toCompanion(bool nullToAbsent) { + return MediaUploadsCompanion( + mediaUploadId: Value(mediaUploadId), + state: Value(state), + metadata: metadata == null && nullToAbsent + ? const Value.absent() + : Value(metadata), + messageIds: messageIds == null && nullToAbsent + ? const Value.absent() + : Value(messageIds), + encryptionData: encryptionData == null && nullToAbsent + ? const Value.absent() + : Value(encryptionData), + ); + } + + factory MediaUploadsData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return MediaUploadsData( + mediaUploadId: serializer.fromJson(json['mediaUploadId']), + state: serializer.fromJson(json['state']), + metadata: serializer.fromJson(json['metadata']), + messageIds: serializer.fromJson(json['messageIds']), + encryptionData: serializer.fromJson(json['encryptionData']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'mediaUploadId': serializer.toJson(mediaUploadId), + 'state': serializer.toJson(state), + 'metadata': serializer.toJson(metadata), + 'messageIds': serializer.toJson(messageIds), + 'encryptionData': serializer.toJson(encryptionData), + }; + } + + MediaUploadsData copyWith( + {int? mediaUploadId, + String? state, + Value metadata = const Value.absent(), + Value messageIds = const Value.absent(), + Value encryptionData = const Value.absent()}) => + MediaUploadsData( + mediaUploadId: mediaUploadId ?? this.mediaUploadId, + state: state ?? this.state, + metadata: metadata.present ? metadata.value : this.metadata, + messageIds: messageIds.present ? messageIds.value : this.messageIds, + encryptionData: + encryptionData.present ? encryptionData.value : this.encryptionData, + ); + MediaUploadsData copyWithCompanion(MediaUploadsCompanion data) { + return MediaUploadsData( + mediaUploadId: data.mediaUploadId.present + ? data.mediaUploadId.value + : this.mediaUploadId, + state: data.state.present ? data.state.value : this.state, + metadata: data.metadata.present ? data.metadata.value : this.metadata, + messageIds: + data.messageIds.present ? data.messageIds.value : this.messageIds, + encryptionData: data.encryptionData.present + ? data.encryptionData.value + : this.encryptionData, + ); + } + + @override + String toString() { + return (StringBuffer('MediaUploadsData(') + ..write('mediaUploadId: $mediaUploadId, ') + ..write('state: $state, ') + ..write('metadata: $metadata, ') + ..write('messageIds: $messageIds, ') + ..write('encryptionData: $encryptionData') + ..write(')')) + .toString(); + } + + @override + int get hashCode => + Object.hash(mediaUploadId, state, metadata, messageIds, encryptionData); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is MediaUploadsData && + other.mediaUploadId == this.mediaUploadId && + other.state == this.state && + other.metadata == this.metadata && + other.messageIds == this.messageIds && + other.encryptionData == this.encryptionData); +} + +class MediaUploadsCompanion extends UpdateCompanion { + final Value mediaUploadId; + final Value state; + final Value metadata; + final Value messageIds; + final Value encryptionData; + 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(), + }); + MediaUploadsCompanion.insert({ + 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(), + }); + static Insertable custom({ + Expression? mediaUploadId, + Expression? state, + Expression? metadata, + Expression? messageIds, + Expression? encryptionData, + }) { + return RawValuesInsertable({ + if (mediaUploadId != null) 'media_upload_id': mediaUploadId, + if (state != null) 'state': state, + if (metadata != null) 'metadata': metadata, + if (messageIds != null) 'message_ids': messageIds, + if (encryptionData != null) 'encryption_data': encryptionData, + }); + } + + MediaUploadsCompanion copyWith( + {Value? mediaUploadId, + Value? state, + Value? metadata, + Value? messageIds, + Value? encryptionData}) { + return MediaUploadsCompanion( + mediaUploadId: mediaUploadId ?? this.mediaUploadId, + state: state ?? this.state, + metadata: metadata ?? this.metadata, + messageIds: messageIds ?? this.messageIds, + encryptionData: encryptionData ?? this.encryptionData, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (mediaUploadId.present) { + map['media_upload_id'] = Variable(mediaUploadId.value); + } + if (state.present) { + map['state'] = Variable(state.value); + } + if (metadata.present) { + map['metadata'] = Variable(metadata.value); + } + if (messageIds.present) { + map['message_ids'] = Variable(messageIds.value); + } + if (encryptionData.present) { + map['encryption_data'] = Variable(encryptionData.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('MediaUploadsCompanion(') + ..write('mediaUploadId: $mediaUploadId, ') + ..write('state: $state, ') + ..write('metadata: $metadata, ') + ..write('messageIds: $messageIds, ') + ..write('encryptionData: $encryptionData') + ..write(')')) + .toString(); + } +} + +class MediaDownloads extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + MediaDownloads(this.attachedDatabase, [this._alias]); + late final GeneratedColumn messageId = GeneratedColumn( + 'message_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn downloadToken = GeneratedColumn( + 'download_token', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true); + @override + List get $columns => [messageId, downloadToken]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'media_downloads'; + @override + Set get $primaryKey => const {}; + @override + MediaDownloadsData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return MediaDownloadsData( + messageId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}message_id'])!, + downloadToken: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}download_token'])!, + ); + } + + @override + MediaDownloads createAlias(String alias) { + return MediaDownloads(attachedDatabase, alias); + } +} + +class MediaDownloadsData extends DataClass + implements Insertable { + final int messageId; + final String downloadToken; + const MediaDownloadsData( + {required this.messageId, required this.downloadToken}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['message_id'] = Variable(messageId); + map['download_token'] = Variable(downloadToken); + return map; + } + + MediaDownloadsCompanion toCompanion(bool nullToAbsent) { + return MediaDownloadsCompanion( + messageId: Value(messageId), + downloadToken: Value(downloadToken), + ); + } + + factory MediaDownloadsData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return MediaDownloadsData( + messageId: serializer.fromJson(json['messageId']), + downloadToken: serializer.fromJson(json['downloadToken']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'messageId': serializer.toJson(messageId), + 'downloadToken': serializer.toJson(downloadToken), + }; + } + + MediaDownloadsData copyWith({int? messageId, String? downloadToken}) => + MediaDownloadsData( + messageId: messageId ?? this.messageId, + downloadToken: downloadToken ?? this.downloadToken, + ); + MediaDownloadsData copyWithCompanion(MediaDownloadsCompanion data) { + return MediaDownloadsData( + messageId: data.messageId.present ? data.messageId.value : this.messageId, + downloadToken: data.downloadToken.present + ? data.downloadToken.value + : this.downloadToken, + ); + } + + @override + String toString() { + return (StringBuffer('MediaDownloadsData(') + ..write('messageId: $messageId, ') + ..write('downloadToken: $downloadToken') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(messageId, downloadToken); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is MediaDownloadsData && + other.messageId == this.messageId && + other.downloadToken == this.downloadToken); +} + +class MediaDownloadsCompanion extends UpdateCompanion { + final Value messageId; + final Value downloadToken; + final Value rowid; + const MediaDownloadsCompanion({ + this.messageId = const Value.absent(), + this.downloadToken = const Value.absent(), + this.rowid = const Value.absent(), + }); + MediaDownloadsCompanion.insert({ + required int messageId, + required String downloadToken, + this.rowid = const Value.absent(), + }) : messageId = Value(messageId), + downloadToken = Value(downloadToken); + static Insertable custom({ + Expression? messageId, + Expression? downloadToken, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (messageId != null) 'message_id': messageId, + if (downloadToken != null) 'download_token': downloadToken, + if (rowid != null) 'rowid': rowid, + }); + } + + MediaDownloadsCompanion copyWith( + {Value? messageId, + Value? downloadToken, + Value? rowid}) { + return MediaDownloadsCompanion( + messageId: messageId ?? this.messageId, + downloadToken: downloadToken ?? this.downloadToken, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (messageId.present) { + map['message_id'] = Variable(messageId.value); + } + if (downloadToken.present) { + map['download_token'] = Variable(downloadToken.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('MediaDownloadsCompanion(') + ..write('messageId: $messageId, ') + ..write('downloadToken: $downloadToken, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class SignalIdentityKeyStores extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalIdentityKeyStores(this.attachedDatabase, [this._alias]); + late final GeneratedColumn deviceId = GeneratedColumn( + 'device_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn name = GeneratedColumn( + 'name', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true); + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => + [deviceId, name, identityKey, createdAt]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_identity_key_stores'; + @override + Set get $primaryKey => {deviceId, name}; + @override + SignalIdentityKeyStoresData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalIdentityKeyStoresData( + deviceId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}device_id'])!, + name: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}name'])!, + identityKey: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}identity_key'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + ); + } + + @override + SignalIdentityKeyStores createAlias(String alias) { + return SignalIdentityKeyStores(attachedDatabase, alias); + } +} + +class SignalIdentityKeyStoresData extends DataClass + implements Insertable { + final int deviceId; + final String name; + final i2.Uint8List identityKey; + final DateTime createdAt; + const SignalIdentityKeyStoresData( + {required this.deviceId, + required this.name, + required this.identityKey, + required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['device_id'] = Variable(deviceId); + map['name'] = Variable(name); + map['identity_key'] = Variable(identityKey); + map['created_at'] = Variable(createdAt); + return map; + } + + SignalIdentityKeyStoresCompanion toCompanion(bool nullToAbsent) { + return SignalIdentityKeyStoresCompanion( + deviceId: Value(deviceId), + name: Value(name), + identityKey: Value(identityKey), + createdAt: Value(createdAt), + ); + } + + factory SignalIdentityKeyStoresData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalIdentityKeyStoresData( + deviceId: serializer.fromJson(json['deviceId']), + name: serializer.fromJson(json['name']), + identityKey: serializer.fromJson(json['identityKey']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'deviceId': serializer.toJson(deviceId), + 'name': serializer.toJson(name), + 'identityKey': serializer.toJson(identityKey), + 'createdAt': serializer.toJson(createdAt), + }; + } + + SignalIdentityKeyStoresData copyWith( + {int? deviceId, + String? name, + i2.Uint8List? identityKey, + DateTime? createdAt}) => + SignalIdentityKeyStoresData( + deviceId: deviceId ?? this.deviceId, + name: name ?? this.name, + identityKey: identityKey ?? this.identityKey, + createdAt: createdAt ?? this.createdAt, + ); + SignalIdentityKeyStoresData copyWithCompanion( + SignalIdentityKeyStoresCompanion data) { + return SignalIdentityKeyStoresData( + deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId, + name: data.name.present ? data.name.value : this.name, + identityKey: + data.identityKey.present ? data.identityKey.value : this.identityKey, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + ); + } + + @override + String toString() { + return (StringBuffer('SignalIdentityKeyStoresData(') + ..write('deviceId: $deviceId, ') + ..write('name: $name, ') + ..write('identityKey: $identityKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + deviceId, name, $driftBlobEquality.hash(identityKey), createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalIdentityKeyStoresData && + other.deviceId == this.deviceId && + other.name == this.name && + $driftBlobEquality.equals(other.identityKey, this.identityKey) && + other.createdAt == this.createdAt); +} + +class SignalIdentityKeyStoresCompanion + extends UpdateCompanion { + final Value deviceId; + final Value name; + final Value identityKey; + final Value createdAt; + final Value rowid; + const SignalIdentityKeyStoresCompanion({ + this.deviceId = const Value.absent(), + this.name = const Value.absent(), + this.identityKey = const Value.absent(), + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }); + SignalIdentityKeyStoresCompanion.insert({ + required int deviceId, + required String name, + required i2.Uint8List identityKey, + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }) : deviceId = Value(deviceId), + name = Value(name), + identityKey = Value(identityKey); + static Insertable custom({ + Expression? deviceId, + Expression? name, + Expression? identityKey, + Expression? createdAt, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (deviceId != null) 'device_id': deviceId, + if (name != null) 'name': name, + if (identityKey != null) 'identity_key': identityKey, + if (createdAt != null) 'created_at': createdAt, + if (rowid != null) 'rowid': rowid, + }); + } + + SignalIdentityKeyStoresCompanion copyWith( + {Value? deviceId, + Value? name, + Value? identityKey, + Value? createdAt, + Value? rowid}) { + return SignalIdentityKeyStoresCompanion( + deviceId: deviceId ?? this.deviceId, + name: name ?? this.name, + identityKey: identityKey ?? this.identityKey, + createdAt: createdAt ?? this.createdAt, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (deviceId.present) { + map['device_id'] = Variable(deviceId.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (identityKey.present) { + map['identity_key'] = Variable(identityKey.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalIdentityKeyStoresCompanion(') + ..write('deviceId: $deviceId, ') + ..write('name: $name, ') + ..write('identityKey: $identityKey, ') + ..write('createdAt: $createdAt, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class SignalPreKeyStores extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalPreKeyStores(this.attachedDatabase, [this._alias]); + late final GeneratedColumn preKeyId = GeneratedColumn( + 'pre_key_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => [preKeyId, preKey, createdAt]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_pre_key_stores'; + @override + Set get $primaryKey => {preKeyId}; + @override + SignalPreKeyStoresData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalPreKeyStoresData( + preKeyId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}pre_key_id'])!, + preKey: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}pre_key'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + ); + } + + @override + SignalPreKeyStores createAlias(String alias) { + return SignalPreKeyStores(attachedDatabase, alias); + } +} + +class SignalPreKeyStoresData extends DataClass + implements Insertable { + final int preKeyId; + final i2.Uint8List preKey; + final DateTime createdAt; + const SignalPreKeyStoresData( + {required this.preKeyId, required this.preKey, required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['pre_key_id'] = Variable(preKeyId); + map['pre_key'] = Variable(preKey); + map['created_at'] = Variable(createdAt); + return map; + } + + SignalPreKeyStoresCompanion toCompanion(bool nullToAbsent) { + return SignalPreKeyStoresCompanion( + preKeyId: Value(preKeyId), + preKey: Value(preKey), + createdAt: Value(createdAt), + ); + } + + factory SignalPreKeyStoresData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalPreKeyStoresData( + preKeyId: serializer.fromJson(json['preKeyId']), + preKey: serializer.fromJson(json['preKey']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'preKeyId': serializer.toJson(preKeyId), + 'preKey': serializer.toJson(preKey), + 'createdAt': serializer.toJson(createdAt), + }; + } + + SignalPreKeyStoresData copyWith( + {int? preKeyId, i2.Uint8List? preKey, DateTime? createdAt}) => + SignalPreKeyStoresData( + preKeyId: preKeyId ?? this.preKeyId, + preKey: preKey ?? this.preKey, + createdAt: createdAt ?? this.createdAt, + ); + SignalPreKeyStoresData copyWithCompanion(SignalPreKeyStoresCompanion data) { + return SignalPreKeyStoresData( + preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId, + preKey: data.preKey.present ? data.preKey.value : this.preKey, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + ); + } + + @override + String toString() { + return (StringBuffer('SignalPreKeyStoresData(') + ..write('preKeyId: $preKeyId, ') + ..write('preKey: $preKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => + Object.hash(preKeyId, $driftBlobEquality.hash(preKey), createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalPreKeyStoresData && + other.preKeyId == this.preKeyId && + $driftBlobEquality.equals(other.preKey, this.preKey) && + other.createdAt == this.createdAt); +} + +class SignalPreKeyStoresCompanion + extends UpdateCompanion { + final Value preKeyId; + final Value preKey; + final Value createdAt; + const SignalPreKeyStoresCompanion({ + this.preKeyId = const Value.absent(), + this.preKey = const Value.absent(), + this.createdAt = const Value.absent(), + }); + SignalPreKeyStoresCompanion.insert({ + this.preKeyId = const Value.absent(), + required i2.Uint8List preKey, + this.createdAt = const Value.absent(), + }) : preKey = Value(preKey); + static Insertable custom({ + Expression? preKeyId, + Expression? preKey, + Expression? createdAt, + }) { + return RawValuesInsertable({ + if (preKeyId != null) 'pre_key_id': preKeyId, + if (preKey != null) 'pre_key': preKey, + if (createdAt != null) 'created_at': createdAt, + }); + } + + SignalPreKeyStoresCompanion copyWith( + {Value? preKeyId, + Value? preKey, + Value? createdAt}) { + return SignalPreKeyStoresCompanion( + preKeyId: preKeyId ?? this.preKeyId, + preKey: preKey ?? this.preKey, + createdAt: createdAt ?? this.createdAt, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (preKeyId.present) { + map['pre_key_id'] = Variable(preKeyId.value); + } + if (preKey.present) { + map['pre_key'] = Variable(preKey.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalPreKeyStoresCompanion(') + ..write('preKeyId: $preKeyId, ') + ..write('preKey: $preKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } +} + +class SignalSenderKeyStores extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalSenderKeyStores(this.attachedDatabase, [this._alias]); + late final GeneratedColumn senderKeyName = GeneratedColumn( + 'sender_key_name', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + @override + List get $columns => [senderKeyName, senderKey]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_sender_key_stores'; + @override + Set get $primaryKey => {senderKeyName}; + @override + SignalSenderKeyStoresData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalSenderKeyStoresData( + senderKeyName: attachedDatabase.typeMapping.read( + DriftSqlType.string, data['${effectivePrefix}sender_key_name'])!, + senderKey: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}sender_key'])!, + ); + } + + @override + SignalSenderKeyStores createAlias(String alias) { + return SignalSenderKeyStores(attachedDatabase, alias); + } +} + +class SignalSenderKeyStoresData extends DataClass + implements Insertable { + final String senderKeyName; + final i2.Uint8List senderKey; + const SignalSenderKeyStoresData( + {required this.senderKeyName, required this.senderKey}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['sender_key_name'] = Variable(senderKeyName); + map['sender_key'] = Variable(senderKey); + return map; + } + + SignalSenderKeyStoresCompanion toCompanion(bool nullToAbsent) { + return SignalSenderKeyStoresCompanion( + senderKeyName: Value(senderKeyName), + senderKey: Value(senderKey), + ); + } + + factory SignalSenderKeyStoresData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalSenderKeyStoresData( + senderKeyName: serializer.fromJson(json['senderKeyName']), + senderKey: serializer.fromJson(json['senderKey']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'senderKeyName': serializer.toJson(senderKeyName), + 'senderKey': serializer.toJson(senderKey), + }; + } + + SignalSenderKeyStoresData copyWith( + {String? senderKeyName, i2.Uint8List? senderKey}) => + SignalSenderKeyStoresData( + senderKeyName: senderKeyName ?? this.senderKeyName, + senderKey: senderKey ?? this.senderKey, + ); + SignalSenderKeyStoresData copyWithCompanion( + SignalSenderKeyStoresCompanion data) { + return SignalSenderKeyStoresData( + senderKeyName: data.senderKeyName.present + ? data.senderKeyName.value + : this.senderKeyName, + senderKey: data.senderKey.present ? data.senderKey.value : this.senderKey, + ); + } + + @override + String toString() { + return (StringBuffer('SignalSenderKeyStoresData(') + ..write('senderKeyName: $senderKeyName, ') + ..write('senderKey: $senderKey') + ..write(')')) + .toString(); + } + + @override + int get hashCode => + Object.hash(senderKeyName, $driftBlobEquality.hash(senderKey)); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalSenderKeyStoresData && + other.senderKeyName == this.senderKeyName && + $driftBlobEquality.equals(other.senderKey, this.senderKey)); +} + +class SignalSenderKeyStoresCompanion + extends UpdateCompanion { + final Value senderKeyName; + final Value senderKey; + final Value rowid; + const SignalSenderKeyStoresCompanion({ + this.senderKeyName = const Value.absent(), + this.senderKey = const Value.absent(), + this.rowid = const Value.absent(), + }); + SignalSenderKeyStoresCompanion.insert({ + required String senderKeyName, + required i2.Uint8List senderKey, + this.rowid = const Value.absent(), + }) : senderKeyName = Value(senderKeyName), + senderKey = Value(senderKey); + static Insertable custom({ + Expression? senderKeyName, + Expression? senderKey, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (senderKeyName != null) 'sender_key_name': senderKeyName, + if (senderKey != null) 'sender_key': senderKey, + if (rowid != null) 'rowid': rowid, + }); + } + + SignalSenderKeyStoresCompanion copyWith( + {Value? senderKeyName, + Value? senderKey, + Value? rowid}) { + return SignalSenderKeyStoresCompanion( + senderKeyName: senderKeyName ?? this.senderKeyName, + senderKey: senderKey ?? this.senderKey, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (senderKeyName.present) { + map['sender_key_name'] = Variable(senderKeyName.value); + } + if (senderKey.present) { + map['sender_key'] = Variable(senderKey.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalSenderKeyStoresCompanion(') + ..write('senderKeyName: $senderKeyName, ') + ..write('senderKey: $senderKey, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class SignalSessionStores extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalSessionStores(this.attachedDatabase, [this._alias]); + late final GeneratedColumn deviceId = GeneratedColumn( + 'device_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn name = GeneratedColumn( + 'name', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true); + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => + [deviceId, name, sessionRecord, createdAt]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_session_stores'; + @override + Set get $primaryKey => {deviceId, name}; + @override + SignalSessionStoresData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalSessionStoresData( + deviceId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}device_id'])!, + name: attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}name'])!, + sessionRecord: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}session_record'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + ); + } + + @override + SignalSessionStores createAlias(String alias) { + return SignalSessionStores(attachedDatabase, alias); + } +} + +class SignalSessionStoresData extends DataClass + implements Insertable { + final int deviceId; + final String name; + final i2.Uint8List sessionRecord; + final DateTime createdAt; + const SignalSessionStoresData( + {required this.deviceId, + required this.name, + required this.sessionRecord, + required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['device_id'] = Variable(deviceId); + map['name'] = Variable(name); + map['session_record'] = Variable(sessionRecord); + map['created_at'] = Variable(createdAt); + return map; + } + + SignalSessionStoresCompanion toCompanion(bool nullToAbsent) { + return SignalSessionStoresCompanion( + deviceId: Value(deviceId), + name: Value(name), + sessionRecord: Value(sessionRecord), + createdAt: Value(createdAt), + ); + } + + factory SignalSessionStoresData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalSessionStoresData( + deviceId: serializer.fromJson(json['deviceId']), + name: serializer.fromJson(json['name']), + sessionRecord: serializer.fromJson(json['sessionRecord']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'deviceId': serializer.toJson(deviceId), + 'name': serializer.toJson(name), + 'sessionRecord': serializer.toJson(sessionRecord), + 'createdAt': serializer.toJson(createdAt), + }; + } + + SignalSessionStoresData copyWith( + {int? deviceId, + String? name, + i2.Uint8List? sessionRecord, + DateTime? createdAt}) => + SignalSessionStoresData( + deviceId: deviceId ?? this.deviceId, + name: name ?? this.name, + sessionRecord: sessionRecord ?? this.sessionRecord, + createdAt: createdAt ?? this.createdAt, + ); + SignalSessionStoresData copyWithCompanion(SignalSessionStoresCompanion data) { + return SignalSessionStoresData( + deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId, + name: data.name.present ? data.name.value : this.name, + sessionRecord: data.sessionRecord.present + ? data.sessionRecord.value + : this.sessionRecord, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + ); + } + + @override + String toString() { + return (StringBuffer('SignalSessionStoresData(') + ..write('deviceId: $deviceId, ') + ..write('name: $name, ') + ..write('sessionRecord: $sessionRecord, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + deviceId, name, $driftBlobEquality.hash(sessionRecord), createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalSessionStoresData && + other.deviceId == this.deviceId && + other.name == this.name && + $driftBlobEquality.equals(other.sessionRecord, this.sessionRecord) && + other.createdAt == this.createdAt); +} + +class SignalSessionStoresCompanion + extends UpdateCompanion { + final Value deviceId; + final Value name; + final Value sessionRecord; + final Value createdAt; + final Value rowid; + const SignalSessionStoresCompanion({ + this.deviceId = const Value.absent(), + this.name = const Value.absent(), + this.sessionRecord = const Value.absent(), + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }); + SignalSessionStoresCompanion.insert({ + required int deviceId, + required String name, + required i2.Uint8List sessionRecord, + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }) : deviceId = Value(deviceId), + name = Value(name), + sessionRecord = Value(sessionRecord); + static Insertable custom({ + Expression? deviceId, + Expression? name, + Expression? sessionRecord, + Expression? createdAt, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (deviceId != null) 'device_id': deviceId, + if (name != null) 'name': name, + if (sessionRecord != null) 'session_record': sessionRecord, + if (createdAt != null) 'created_at': createdAt, + if (rowid != null) 'rowid': rowid, + }); + } + + SignalSessionStoresCompanion copyWith( + {Value? deviceId, + Value? name, + Value? sessionRecord, + Value? createdAt, + Value? rowid}) { + return SignalSessionStoresCompanion( + deviceId: deviceId ?? this.deviceId, + name: name ?? this.name, + sessionRecord: sessionRecord ?? this.sessionRecord, + createdAt: createdAt ?? this.createdAt, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (deviceId.present) { + map['device_id'] = Variable(deviceId.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (sessionRecord.present) { + map['session_record'] = Variable(sessionRecord.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalSessionStoresCompanion(') + ..write('deviceId: $deviceId, ') + ..write('name: $name, ') + ..write('sessionRecord: $sessionRecord, ') + ..write('createdAt: $createdAt, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class SignalContactPreKeys extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalContactPreKeys(this.attachedDatabase, [this._alias]); + late final GeneratedColumn contactId = GeneratedColumn( + 'contact_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn preKeyId = GeneratedColumn( + 'pre_key_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => + [contactId, preKeyId, preKey, createdAt]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_contact_pre_keys'; + @override + Set get $primaryKey => {contactId, preKeyId}; + @override + SignalContactPreKeysData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalContactPreKeysData( + contactId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}contact_id'])!, + preKeyId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}pre_key_id'])!, + preKey: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}pre_key'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + ); + } + + @override + SignalContactPreKeys createAlias(String alias) { + return SignalContactPreKeys(attachedDatabase, alias); + } +} + +class SignalContactPreKeysData extends DataClass + implements Insertable { + final int contactId; + final int preKeyId; + final i2.Uint8List preKey; + final DateTime createdAt; + const SignalContactPreKeysData( + {required this.contactId, + required this.preKeyId, + required this.preKey, + required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['contact_id'] = Variable(contactId); + map['pre_key_id'] = Variable(preKeyId); + map['pre_key'] = Variable(preKey); + map['created_at'] = Variable(createdAt); + return map; + } + + SignalContactPreKeysCompanion toCompanion(bool nullToAbsent) { + return SignalContactPreKeysCompanion( + contactId: Value(contactId), + preKeyId: Value(preKeyId), + preKey: Value(preKey), + createdAt: Value(createdAt), + ); + } + + factory SignalContactPreKeysData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalContactPreKeysData( + contactId: serializer.fromJson(json['contactId']), + preKeyId: serializer.fromJson(json['preKeyId']), + preKey: serializer.fromJson(json['preKey']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'contactId': serializer.toJson(contactId), + 'preKeyId': serializer.toJson(preKeyId), + 'preKey': serializer.toJson(preKey), + 'createdAt': serializer.toJson(createdAt), + }; + } + + SignalContactPreKeysData copyWith( + {int? contactId, + int? preKeyId, + i2.Uint8List? preKey, + DateTime? createdAt}) => + SignalContactPreKeysData( + contactId: contactId ?? this.contactId, + preKeyId: preKeyId ?? this.preKeyId, + preKey: preKey ?? this.preKey, + createdAt: createdAt ?? this.createdAt, + ); + SignalContactPreKeysData copyWithCompanion( + SignalContactPreKeysCompanion data) { + return SignalContactPreKeysData( + contactId: data.contactId.present ? data.contactId.value : this.contactId, + preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId, + preKey: data.preKey.present ? data.preKey.value : this.preKey, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + ); + } + + @override + String toString() { + return (StringBuffer('SignalContactPreKeysData(') + ..write('contactId: $contactId, ') + ..write('preKeyId: $preKeyId, ') + ..write('preKey: $preKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + contactId, preKeyId, $driftBlobEquality.hash(preKey), createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalContactPreKeysData && + other.contactId == this.contactId && + other.preKeyId == this.preKeyId && + $driftBlobEquality.equals(other.preKey, this.preKey) && + other.createdAt == this.createdAt); +} + +class SignalContactPreKeysCompanion + extends UpdateCompanion { + final Value contactId; + final Value preKeyId; + final Value preKey; + final Value createdAt; + final Value rowid; + const SignalContactPreKeysCompanion({ + this.contactId = const Value.absent(), + this.preKeyId = const Value.absent(), + this.preKey = const Value.absent(), + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }); + SignalContactPreKeysCompanion.insert({ + required int contactId, + required int preKeyId, + required i2.Uint8List preKey, + this.createdAt = const Value.absent(), + this.rowid = const Value.absent(), + }) : contactId = Value(contactId), + preKeyId = Value(preKeyId), + preKey = Value(preKey); + static Insertable custom({ + Expression? contactId, + Expression? preKeyId, + Expression? preKey, + Expression? createdAt, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (contactId != null) 'contact_id': contactId, + if (preKeyId != null) 'pre_key_id': preKeyId, + if (preKey != null) 'pre_key': preKey, + if (createdAt != null) 'created_at': createdAt, + if (rowid != null) 'rowid': rowid, + }); + } + + SignalContactPreKeysCompanion copyWith( + {Value? contactId, + Value? preKeyId, + Value? preKey, + Value? createdAt, + Value? rowid}) { + return SignalContactPreKeysCompanion( + contactId: contactId ?? this.contactId, + preKeyId: preKeyId ?? this.preKeyId, + preKey: preKey ?? this.preKey, + createdAt: createdAt ?? this.createdAt, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (contactId.present) { + map['contact_id'] = Variable(contactId.value); + } + if (preKeyId.present) { + map['pre_key_id'] = Variable(preKeyId.value); + } + if (preKey.present) { + map['pre_key'] = Variable(preKey.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalContactPreKeysCompanion(') + ..write('contactId: $contactId, ') + ..write('preKeyId: $preKeyId, ') + ..write('preKey: $preKey, ') + ..write('createdAt: $createdAt, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class SignalContactSignedPreKeys extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + SignalContactSignedPreKeys(this.attachedDatabase, [this._alias]); + late final GeneratedColumn contactId = GeneratedColumn( + 'contact_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: false); + late final GeneratedColumn signedPreKeyId = GeneratedColumn( + 'signed_pre_key_id', aliasedName, false, + type: DriftSqlType.int, requiredDuringInsert: true); + late final GeneratedColumn signedPreKey = + GeneratedColumn('signed_pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn signedPreKeySignature = + GeneratedColumn( + 'signed_pre_key_signature', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: const CustomExpression( + 'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)')); + @override + List get $columns => [ + contactId, + signedPreKeyId, + signedPreKey, + signedPreKeySignature, + createdAt + ]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'signal_contact_signed_pre_keys'; + @override + Set get $primaryKey => {contactId}; + @override + SignalContactSignedPreKeysData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return SignalContactSignedPreKeysData( + contactId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}contact_id'])!, + signedPreKeyId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}signed_pre_key_id'])!, + signedPreKey: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}signed_pre_key'])!, + signedPreKeySignature: attachedDatabase.typeMapping.read( + DriftSqlType.blob, + data['${effectivePrefix}signed_pre_key_signature'])!, + createdAt: attachedDatabase.typeMapping + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + ); + } + + @override + SignalContactSignedPreKeys createAlias(String alias) { + return SignalContactSignedPreKeys(attachedDatabase, alias); + } +} + +class SignalContactSignedPreKeysData extends DataClass + implements Insertable { + final int contactId; + final int signedPreKeyId; + final i2.Uint8List signedPreKey; + final i2.Uint8List signedPreKeySignature; + final DateTime createdAt; + const SignalContactSignedPreKeysData( + {required this.contactId, + required this.signedPreKeyId, + required this.signedPreKey, + required this.signedPreKeySignature, + required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['contact_id'] = Variable(contactId); + map['signed_pre_key_id'] = Variable(signedPreKeyId); + map['signed_pre_key'] = Variable(signedPreKey); + map['signed_pre_key_signature'] = + Variable(signedPreKeySignature); + map['created_at'] = Variable(createdAt); + return map; + } + + SignalContactSignedPreKeysCompanion toCompanion(bool nullToAbsent) { + return SignalContactSignedPreKeysCompanion( + contactId: Value(contactId), + signedPreKeyId: Value(signedPreKeyId), + signedPreKey: Value(signedPreKey), + signedPreKeySignature: Value(signedPreKeySignature), + createdAt: Value(createdAt), + ); + } + + factory SignalContactSignedPreKeysData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return SignalContactSignedPreKeysData( + contactId: serializer.fromJson(json['contactId']), + signedPreKeyId: serializer.fromJson(json['signedPreKeyId']), + signedPreKey: serializer.fromJson(json['signedPreKey']), + signedPreKeySignature: + serializer.fromJson(json['signedPreKeySignature']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'contactId': serializer.toJson(contactId), + 'signedPreKeyId': serializer.toJson(signedPreKeyId), + 'signedPreKey': serializer.toJson(signedPreKey), + 'signedPreKeySignature': + serializer.toJson(signedPreKeySignature), + 'createdAt': serializer.toJson(createdAt), + }; + } + + SignalContactSignedPreKeysData copyWith( + {int? contactId, + int? signedPreKeyId, + i2.Uint8List? signedPreKey, + i2.Uint8List? signedPreKeySignature, + DateTime? createdAt}) => + SignalContactSignedPreKeysData( + contactId: contactId ?? this.contactId, + signedPreKeyId: signedPreKeyId ?? this.signedPreKeyId, + signedPreKey: signedPreKey ?? this.signedPreKey, + signedPreKeySignature: + signedPreKeySignature ?? this.signedPreKeySignature, + createdAt: createdAt ?? this.createdAt, + ); + SignalContactSignedPreKeysData copyWithCompanion( + SignalContactSignedPreKeysCompanion data) { + return SignalContactSignedPreKeysData( + contactId: data.contactId.present ? data.contactId.value : this.contactId, + signedPreKeyId: data.signedPreKeyId.present + ? data.signedPreKeyId.value + : this.signedPreKeyId, + signedPreKey: data.signedPreKey.present + ? data.signedPreKey.value + : this.signedPreKey, + signedPreKeySignature: data.signedPreKeySignature.present + ? data.signedPreKeySignature.value + : this.signedPreKeySignature, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + ); + } + + @override + String toString() { + return (StringBuffer('SignalContactSignedPreKeysData(') + ..write('contactId: $contactId, ') + ..write('signedPreKeyId: $signedPreKeyId, ') + ..write('signedPreKey: $signedPreKey, ') + ..write('signedPreKeySignature: $signedPreKeySignature, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + contactId, + signedPreKeyId, + $driftBlobEquality.hash(signedPreKey), + $driftBlobEquality.hash(signedPreKeySignature), + createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is SignalContactSignedPreKeysData && + other.contactId == this.contactId && + other.signedPreKeyId == this.signedPreKeyId && + $driftBlobEquality.equals(other.signedPreKey, this.signedPreKey) && + $driftBlobEquality.equals( + other.signedPreKeySignature, this.signedPreKeySignature) && + other.createdAt == this.createdAt); +} + +class SignalContactSignedPreKeysCompanion + extends UpdateCompanion { + final Value contactId; + final Value signedPreKeyId; + final Value signedPreKey; + final Value signedPreKeySignature; + final Value createdAt; + const SignalContactSignedPreKeysCompanion({ + this.contactId = const Value.absent(), + this.signedPreKeyId = const Value.absent(), + this.signedPreKey = const Value.absent(), + this.signedPreKeySignature = const Value.absent(), + this.createdAt = const Value.absent(), + }); + SignalContactSignedPreKeysCompanion.insert({ + this.contactId = const Value.absent(), + required int signedPreKeyId, + required i2.Uint8List signedPreKey, + required i2.Uint8List signedPreKeySignature, + this.createdAt = const Value.absent(), + }) : signedPreKeyId = Value(signedPreKeyId), + signedPreKey = Value(signedPreKey), + signedPreKeySignature = Value(signedPreKeySignature); + static Insertable custom({ + Expression? contactId, + Expression? signedPreKeyId, + Expression? signedPreKey, + Expression? signedPreKeySignature, + Expression? createdAt, + }) { + return RawValuesInsertable({ + if (contactId != null) 'contact_id': contactId, + if (signedPreKeyId != null) 'signed_pre_key_id': signedPreKeyId, + if (signedPreKey != null) 'signed_pre_key': signedPreKey, + if (signedPreKeySignature != null) + 'signed_pre_key_signature': signedPreKeySignature, + if (createdAt != null) 'created_at': createdAt, + }); + } + + SignalContactSignedPreKeysCompanion copyWith( + {Value? contactId, + Value? signedPreKeyId, + Value? signedPreKey, + Value? signedPreKeySignature, + Value? createdAt}) { + return SignalContactSignedPreKeysCompanion( + contactId: contactId ?? this.contactId, + signedPreKeyId: signedPreKeyId ?? this.signedPreKeyId, + signedPreKey: signedPreKey ?? this.signedPreKey, + signedPreKeySignature: + signedPreKeySignature ?? this.signedPreKeySignature, + createdAt: createdAt ?? this.createdAt, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (contactId.present) { + map['contact_id'] = Variable(contactId.value); + } + if (signedPreKeyId.present) { + map['signed_pre_key_id'] = Variable(signedPreKeyId.value); + } + if (signedPreKey.present) { + map['signed_pre_key'] = Variable(signedPreKey.value); + } + if (signedPreKeySignature.present) { + map['signed_pre_key_signature'] = + Variable(signedPreKeySignature.value); + } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('SignalContactSignedPreKeysCompanion(') + ..write('contactId: $contactId, ') + ..write('signedPreKeyId: $signedPreKeyId, ') + ..write('signedPreKey: $signedPreKey, ') + ..write('signedPreKeySignature: $signedPreKeySignature, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } +} + +class MessageRetransmissions extends Table + with TableInfo { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + MessageRetransmissions(this.attachedDatabase, [this._alias]); + late final GeneratedColumn retransmissionId = GeneratedColumn( + 'retransmission_id', aliasedName, false, + hasAutoIncrement: true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: + GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + late final GeneratedColumn contactId = GeneratedColumn( + 'contact_id', aliasedName, false, + type: DriftSqlType.int, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES contacts (user_id) ON DELETE CASCADE')); + late final GeneratedColumn messageId = GeneratedColumn( + 'message_id', aliasedName, true, + type: DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES messages (message_id) ON DELETE CASCADE')); + late final GeneratedColumn plaintextContent = + GeneratedColumn('plaintext_content', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn pushData = + GeneratedColumn('push_data', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn encryptedHash = + GeneratedColumn('encrypted_hash', aliasedName, true, + type: DriftSqlType.blob, requiredDuringInsert: false); + late final GeneratedColumn acknowledgeByServerAt = + GeneratedColumn('acknowledge_by_server_at', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); + @override + List get $columns => [ + retransmissionId, + contactId, + messageId, + plaintextContent, + pushData, + encryptedHash, + acknowledgeByServerAt + ]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'message_retransmissions'; + @override + Set get $primaryKey => {retransmissionId}; + @override + MessageRetransmissionsData map(Map data, + {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return MessageRetransmissionsData( + retransmissionId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}retransmission_id'])!, + contactId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}contact_id'])!, + messageId: attachedDatabase.typeMapping + .read(DriftSqlType.int, data['${effectivePrefix}message_id']), + plaintextContent: attachedDatabase.typeMapping.read( + DriftSqlType.blob, data['${effectivePrefix}plaintext_content'])!, + pushData: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}push_data']), + encryptedHash: attachedDatabase.typeMapping + .read(DriftSqlType.blob, data['${effectivePrefix}encrypted_hash']), + acknowledgeByServerAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}acknowledge_by_server_at']), + ); + } + + @override + MessageRetransmissions createAlias(String alias) { + return MessageRetransmissions(attachedDatabase, alias); + } +} + +class MessageRetransmissionsData extends DataClass + implements Insertable { + final int retransmissionId; + final int contactId; + final int? messageId; + final i2.Uint8List plaintextContent; + final i2.Uint8List? pushData; + final i2.Uint8List? encryptedHash; + final DateTime? acknowledgeByServerAt; + const MessageRetransmissionsData( + {required this.retransmissionId, + required this.contactId, + this.messageId, + required this.plaintextContent, + this.pushData, + this.encryptedHash, + this.acknowledgeByServerAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['retransmission_id'] = Variable(retransmissionId); + map['contact_id'] = Variable(contactId); + if (!nullToAbsent || messageId != null) { + map['message_id'] = Variable(messageId); + } + map['plaintext_content'] = Variable(plaintextContent); + if (!nullToAbsent || pushData != null) { + map['push_data'] = Variable(pushData); + } + if (!nullToAbsent || encryptedHash != null) { + map['encrypted_hash'] = Variable(encryptedHash); + } + if (!nullToAbsent || acknowledgeByServerAt != null) { + map['acknowledge_by_server_at'] = + Variable(acknowledgeByServerAt); + } + return map; + } + + MessageRetransmissionsCompanion toCompanion(bool nullToAbsent) { + return MessageRetransmissionsCompanion( + retransmissionId: Value(retransmissionId), + contactId: Value(contactId), + messageId: messageId == null && nullToAbsent + ? const Value.absent() + : Value(messageId), + plaintextContent: Value(plaintextContent), + pushData: pushData == null && nullToAbsent + ? const Value.absent() + : Value(pushData), + encryptedHash: encryptedHash == null && nullToAbsent + ? const Value.absent() + : Value(encryptedHash), + acknowledgeByServerAt: acknowledgeByServerAt == null && nullToAbsent + ? const Value.absent() + : Value(acknowledgeByServerAt), + ); + } + + factory MessageRetransmissionsData.fromJson(Map json, + {ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return MessageRetransmissionsData( + retransmissionId: serializer.fromJson(json['retransmissionId']), + contactId: serializer.fromJson(json['contactId']), + messageId: serializer.fromJson(json['messageId']), + plaintextContent: + serializer.fromJson(json['plaintextContent']), + pushData: serializer.fromJson(json['pushData']), + encryptedHash: serializer.fromJson(json['encryptedHash']), + acknowledgeByServerAt: + serializer.fromJson(json['acknowledgeByServerAt']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'retransmissionId': serializer.toJson(retransmissionId), + 'contactId': serializer.toJson(contactId), + 'messageId': serializer.toJson(messageId), + 'plaintextContent': serializer.toJson(plaintextContent), + 'pushData': serializer.toJson(pushData), + 'encryptedHash': serializer.toJson(encryptedHash), + 'acknowledgeByServerAt': + serializer.toJson(acknowledgeByServerAt), + }; + } + + MessageRetransmissionsData copyWith( + {int? retransmissionId, + int? contactId, + Value messageId = const Value.absent(), + i2.Uint8List? plaintextContent, + Value pushData = const Value.absent(), + Value encryptedHash = const Value.absent(), + Value acknowledgeByServerAt = const Value.absent()}) => + MessageRetransmissionsData( + retransmissionId: retransmissionId ?? this.retransmissionId, + contactId: contactId ?? this.contactId, + messageId: messageId.present ? messageId.value : this.messageId, + plaintextContent: plaintextContent ?? this.plaintextContent, + pushData: pushData.present ? pushData.value : this.pushData, + encryptedHash: + encryptedHash.present ? encryptedHash.value : this.encryptedHash, + acknowledgeByServerAt: acknowledgeByServerAt.present + ? acknowledgeByServerAt.value + : this.acknowledgeByServerAt, + ); + MessageRetransmissionsData copyWithCompanion( + MessageRetransmissionsCompanion data) { + return MessageRetransmissionsData( + retransmissionId: data.retransmissionId.present + ? data.retransmissionId.value + : this.retransmissionId, + contactId: data.contactId.present ? data.contactId.value : this.contactId, + messageId: data.messageId.present ? data.messageId.value : this.messageId, + plaintextContent: data.plaintextContent.present + ? data.plaintextContent.value + : this.plaintextContent, + pushData: data.pushData.present ? data.pushData.value : this.pushData, + encryptedHash: data.encryptedHash.present + ? data.encryptedHash.value + : this.encryptedHash, + acknowledgeByServerAt: data.acknowledgeByServerAt.present + ? data.acknowledgeByServerAt.value + : this.acknowledgeByServerAt, + ); + } + + @override + String toString() { + return (StringBuffer('MessageRetransmissionsData(') + ..write('retransmissionId: $retransmissionId, ') + ..write('contactId: $contactId, ') + ..write('messageId: $messageId, ') + ..write('plaintextContent: $plaintextContent, ') + ..write('pushData: $pushData, ') + ..write('encryptedHash: $encryptedHash, ') + ..write('acknowledgeByServerAt: $acknowledgeByServerAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash( + retransmissionId, + contactId, + messageId, + $driftBlobEquality.hash(plaintextContent), + $driftBlobEquality.hash(pushData), + $driftBlobEquality.hash(encryptedHash), + acknowledgeByServerAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is MessageRetransmissionsData && + other.retransmissionId == this.retransmissionId && + other.contactId == this.contactId && + other.messageId == this.messageId && + $driftBlobEquality.equals( + other.plaintextContent, this.plaintextContent) && + $driftBlobEquality.equals(other.pushData, this.pushData) && + $driftBlobEquality.equals(other.encryptedHash, this.encryptedHash) && + other.acknowledgeByServerAt == this.acknowledgeByServerAt); +} + +class MessageRetransmissionsCompanion + extends UpdateCompanion { + final Value retransmissionId; + final Value contactId; + final Value messageId; + final Value plaintextContent; + final Value pushData; + final Value encryptedHash; + final Value acknowledgeByServerAt; + const MessageRetransmissionsCompanion({ + this.retransmissionId = const Value.absent(), + this.contactId = const Value.absent(), + this.messageId = const Value.absent(), + this.plaintextContent = const Value.absent(), + this.pushData = const Value.absent(), + this.encryptedHash = const Value.absent(), + this.acknowledgeByServerAt = const Value.absent(), + }); + MessageRetransmissionsCompanion.insert({ + this.retransmissionId = const Value.absent(), + required int contactId, + this.messageId = const Value.absent(), + required i2.Uint8List plaintextContent, + this.pushData = const Value.absent(), + this.encryptedHash = const Value.absent(), + this.acknowledgeByServerAt = const Value.absent(), + }) : contactId = Value(contactId), + plaintextContent = Value(plaintextContent); + static Insertable custom({ + Expression? retransmissionId, + Expression? contactId, + Expression? messageId, + Expression? plaintextContent, + Expression? pushData, + Expression? encryptedHash, + Expression? acknowledgeByServerAt, + }) { + return RawValuesInsertable({ + if (retransmissionId != null) 'retransmission_id': retransmissionId, + if (contactId != null) 'contact_id': contactId, + if (messageId != null) 'message_id': messageId, + if (plaintextContent != null) 'plaintext_content': plaintextContent, + if (pushData != null) 'push_data': pushData, + if (encryptedHash != null) 'encrypted_hash': encryptedHash, + if (acknowledgeByServerAt != null) + 'acknowledge_by_server_at': acknowledgeByServerAt, + }); + } + + MessageRetransmissionsCompanion copyWith( + {Value? retransmissionId, + Value? contactId, + Value? messageId, + Value? plaintextContent, + Value? pushData, + Value? encryptedHash, + Value? acknowledgeByServerAt}) { + return MessageRetransmissionsCompanion( + retransmissionId: retransmissionId ?? this.retransmissionId, + contactId: contactId ?? this.contactId, + messageId: messageId ?? this.messageId, + plaintextContent: plaintextContent ?? this.plaintextContent, + pushData: pushData ?? this.pushData, + encryptedHash: encryptedHash ?? this.encryptedHash, + acknowledgeByServerAt: + acknowledgeByServerAt ?? this.acknowledgeByServerAt, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (retransmissionId.present) { + map['retransmission_id'] = Variable(retransmissionId.value); + } + if (contactId.present) { + map['contact_id'] = Variable(contactId.value); + } + if (messageId.present) { + map['message_id'] = Variable(messageId.value); + } + if (plaintextContent.present) { + map['plaintext_content'] = Variable(plaintextContent.value); + } + if (pushData.present) { + map['push_data'] = Variable(pushData.value); + } + if (encryptedHash.present) { + map['encrypted_hash'] = Variable(encryptedHash.value); + } + if (acknowledgeByServerAt.present) { + map['acknowledge_by_server_at'] = + Variable(acknowledgeByServerAt.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('MessageRetransmissionsCompanion(') + ..write('retransmissionId: $retransmissionId, ') + ..write('contactId: $contactId, ') + ..write('messageId: $messageId, ') + ..write('plaintextContent: $plaintextContent, ') + ..write('pushData: $pushData, ') + ..write('encryptedHash: $encryptedHash, ') + ..write('acknowledgeByServerAt: $acknowledgeByServerAt') + ..write(')')) + .toString(); + } +} + +class DatabaseAtV15 extends GeneratedDatabase { + DatabaseAtV15(QueryExecutor e) : super(e); + late final Contacts contacts = Contacts(this); + late final Messages messages = Messages(this); + late final MediaUploads mediaUploads = MediaUploads(this); + late final MediaDownloads mediaDownloads = MediaDownloads(this); + late final SignalIdentityKeyStores signalIdentityKeyStores = + SignalIdentityKeyStores(this); + late final SignalPreKeyStores signalPreKeyStores = SignalPreKeyStores(this); + late final SignalSenderKeyStores signalSenderKeyStores = + SignalSenderKeyStores(this); + late final SignalSessionStores signalSessionStores = + SignalSessionStores(this); + late final SignalContactPreKeys signalContactPreKeys = + SignalContactPreKeys(this); + late final SignalContactSignedPreKeys signalContactSignedPreKeys = + SignalContactSignedPreKeys(this); + late final MessageRetransmissions messageRetransmissions = + MessageRetransmissions(this); + @override + Iterable> get allTables => + allSchemaEntities.whereType>(); + @override + List get allSchemaEntities => [ + contacts, + messages, + mediaUploads, + mediaDownloads, + signalIdentityKeyStores, + signalPreKeyStores, + signalSenderKeyStores, + signalSessionStores, + signalContactPreKeys, + signalContactSignedPreKeys, + messageRetransmissions + ]; + @override + int get schemaVersion => 15; +} diff --git a/test/drift/twonly_database/generated/schema_v2.dart b/test/drift/twonly_database/generated/schema_v2.dart index 36f0094..3864371 100644 --- a/test/drift/twonly_database/generated/schema_v2.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1342,7 +1343,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -1374,7 +1375,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1384,7 +1385,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -1477,7 +1478,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -1499,7 +1500,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1532,9 +1533,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -1572,7 +1573,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -1598,7 +1599,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1607,13 +1608,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -1678,7 +1679,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -1694,7 +1695,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1722,9 +1723,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -1755,14 +1756,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -1778,7 +1779,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -1786,12 +1787,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -1856,7 +1857,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -1872,7 +1873,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -1903,8 +1904,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1948,7 +1949,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -1980,7 +1981,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1990,7 +1991,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2083,7 +2084,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2105,7 +2106,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v3.dart b/test/drift/twonly_database/generated/schema_v3.dart index 8c424b5..4734df0 100644 --- a/test/drift/twonly_database/generated/schema_v3.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1418,7 +1419,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -1450,7 +1451,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1460,7 +1461,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -1553,7 +1554,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -1575,7 +1576,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1608,9 +1609,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -1648,7 +1649,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -1674,7 +1675,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1683,13 +1684,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -1754,7 +1755,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -1770,7 +1771,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1798,9 +1799,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -1831,14 +1832,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -1854,7 +1855,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -1862,12 +1863,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -1932,7 +1933,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -1948,7 +1949,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -1979,8 +1980,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2024,7 +2025,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2056,7 +2057,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2066,7 +2067,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2159,7 +2160,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2181,7 +2182,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v4.dart b/test/drift/twonly_database/generated/schema_v4.dart index 240b075..f08b509 100644 --- a/test/drift/twonly_database/generated/schema_v4.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -1755,7 +1756,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -1787,7 +1788,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -1797,7 +1798,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -1890,7 +1891,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -1912,7 +1913,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1945,9 +1946,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -1985,7 +1986,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2011,7 +2012,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2020,13 +2021,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2091,7 +2092,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2107,7 +2108,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2135,9 +2136,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2168,14 +2169,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2191,7 +2192,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2199,12 +2200,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2269,7 +2270,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2285,7 +2286,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2316,8 +2317,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2361,7 +2362,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2393,7 +2394,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2403,7 +2404,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2496,7 +2497,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2518,7 +2519,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v5.dart b/test/drift/twonly_database/generated/schema_v5.dart index 6820028..b912a2e 100644 --- a/test/drift/twonly_database/generated/schema_v5.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2001,7 +2002,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2033,7 +2034,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2043,7 +2044,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2136,7 +2137,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2158,7 +2159,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2191,9 +2192,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2231,7 +2232,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2257,7 +2258,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2266,13 +2267,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2337,7 +2338,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2353,7 +2354,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2381,9 +2382,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2414,14 +2415,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2437,7 +2438,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2445,12 +2446,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2515,7 +2516,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2531,7 +2532,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2562,8 +2563,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2607,7 +2608,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2639,7 +2640,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2649,7 +2650,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2742,7 +2743,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2764,7 +2765,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v6.dart b/test/drift/twonly_database/generated/schema_v6.dart index 2f45a8d..e199e58 100644 --- a/test/drift/twonly_database/generated/schema_v6.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2035,7 +2036,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2067,7 +2068,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2077,7 +2078,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2170,7 +2171,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2192,7 +2193,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2225,9 +2226,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2265,7 +2266,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2291,7 +2292,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2300,13 +2301,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2371,7 +2372,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2387,7 +2388,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2415,9 +2416,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2448,14 +2449,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2471,7 +2472,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2479,12 +2480,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2549,7 +2550,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2565,7 +2566,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2596,8 +2597,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2641,7 +2642,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2673,7 +2674,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2683,7 +2684,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2776,7 +2777,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2798,7 +2799,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v7.dart b/test/drift/twonly_database/generated/schema_v7.dart index fce325f..3b41de8 100644 --- a/test/drift/twonly_database/generated/schema_v7.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2068,7 +2069,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2100,7 +2101,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2110,7 +2111,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2203,7 +2204,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2225,7 +2226,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2258,9 +2259,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2298,7 +2299,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2324,7 +2325,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2333,13 +2334,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2404,7 +2405,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2420,7 +2421,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2448,9 +2449,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2481,14 +2482,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2504,7 +2505,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2512,12 +2513,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2582,7 +2583,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2598,7 +2599,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2629,8 +2630,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2674,7 +2675,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2706,7 +2707,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2716,7 +2717,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2809,7 +2810,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2831,7 +2832,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v8.dart b/test/drift/twonly_database/generated/schema_v8.dart index 8ceba8d..8ea2c34 100644 --- a/test/drift/twonly_database/generated/schema_v8.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2140,7 +2141,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2172,7 +2173,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2182,7 +2183,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2275,7 +2276,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2297,7 +2298,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2330,9 +2331,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2370,7 +2371,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2396,7 +2397,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2405,13 +2406,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2476,7 +2477,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2492,7 +2493,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2520,9 +2521,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2553,14 +2554,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2576,7 +2577,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2584,12 +2585,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2654,7 +2655,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2670,7 +2671,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2701,8 +2702,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2746,7 +2747,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2778,7 +2779,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2788,7 +2789,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2881,7 +2882,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2903,7 +2904,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); diff --git a/test/drift/twonly_database/generated/schema_v9.dart b/test/drift/twonly_database/generated/schema_v9.dart index e427b32..d3fd7bf 100644 --- a/test/drift/twonly_database/generated/schema_v9.dart +++ b/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 name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn identityKey = - GeneratedColumn('identity_key', aliasedName, false, + late final GeneratedColumn identityKey = + GeneratedColumn('identity_key', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2144,7 +2145,7 @@ class SignalIdentityKeyStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['identity_key'] = Variable(identityKey); + map['identity_key'] = Variable(identityKey); map['created_at'] = Variable(createdAt); return map; } @@ -2176,7 +2177,7 @@ class SignalIdentityKeyStoresData extends DataClass return SignalIdentityKeyStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - identityKey: serializer.fromJson(json['identityKey']), + identityKey: serializer.fromJson(json['identityKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2186,7 +2187,7 @@ class SignalIdentityKeyStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'identityKey': serializer.toJson(identityKey), + 'identityKey': serializer.toJson(identityKey), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value identityKey; + final Value identityKey; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? identityKey, + Expression? identityKey, Expression? createdAt, Expression? rowid, }) { @@ -2279,7 +2280,7 @@ class SignalIdentityKeyStoresCompanion SignalIdentityKeyStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? identityKey, + Value? identityKey, Value? createdAt, Value? rowid}) { return SignalIdentityKeyStoresCompanion( @@ -2301,7 +2302,7 @@ class SignalIdentityKeyStoresCompanion map['name'] = Variable(name.value); } if (identityKey.present) { - map['identity_key'] = Variable(identityKey.value); + map['identity_key'] = Variable(identityKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2334,9 +2335,9 @@ class SignalPreKeyStores extends Table late final GeneratedColumn preKeyId = GeneratedColumn( 'pre_key_id', aliasedName, false, type: DriftSqlType.int, requiredDuringInsert: false); - late final GeneratedColumn preKey = GeneratedColumn( - 'pre_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn preKey = + GeneratedColumn('pre_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, type: DriftSqlType.dateTime, @@ -2374,7 +2375,7 @@ class SignalPreKeyStores extends Table class SignalPreKeyStoresData extends DataClass implements Insertable { 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 toColumns(bool nullToAbsent) { final map = {}; map['pre_key_id'] = Variable(preKeyId); - map['pre_key'] = Variable(preKey); + map['pre_key'] = Variable(preKey); map['created_at'] = Variable(createdAt); return map; } @@ -2400,7 +2401,7 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalPreKeyStoresData( preKeyId: serializer.fromJson(json['preKeyId']), - preKey: serializer.fromJson(json['preKey']), + preKey: serializer.fromJson(json['preKey']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2409,13 +2410,13 @@ class SignalPreKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'preKeyId': serializer.toJson(preKeyId), - 'preKey': serializer.toJson(preKey), + 'preKey': serializer.toJson(preKey), 'createdAt': serializer.toJson(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 { final Value preKeyId; - final Value preKey; + final Value preKey; final Value 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 custom({ Expression? preKeyId, - Expression? preKey, + Expression? preKey, Expression? createdAt, }) { return RawValuesInsertable({ @@ -2480,7 +2481,7 @@ class SignalPreKeyStoresCompanion SignalPreKeyStoresCompanion copyWith( {Value? preKeyId, - Value? preKey, + Value? preKey, Value? createdAt}) { return SignalPreKeyStoresCompanion( preKeyId: preKeyId ?? this.preKeyId, @@ -2496,7 +2497,7 @@ class SignalPreKeyStoresCompanion map['pre_key_id'] = Variable(preKeyId.value); } if (preKey.present) { - map['pre_key'] = Variable(preKey.value); + map['pre_key'] = Variable(preKey.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -2524,9 +2525,9 @@ class SignalSenderKeyStores extends Table late final GeneratedColumn senderKeyName = GeneratedColumn( 'sender_key_name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn senderKey = GeneratedColumn( - 'sender_key', aliasedName, false, - type: DriftSqlType.blob, requiredDuringInsert: true); + late final GeneratedColumn senderKey = + GeneratedColumn('sender_key', aliasedName, false, + type: DriftSqlType.blob, requiredDuringInsert: true); @override List get $columns => [senderKeyName, senderKey]; @override @@ -2557,14 +2558,14 @@ class SignalSenderKeyStores extends Table class SignalSenderKeyStoresData extends DataClass implements Insertable { final String senderKeyName; - final Uint8List senderKey; + final i2.Uint8List senderKey; const SignalSenderKeyStoresData( {required this.senderKeyName, required this.senderKey}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['sender_key_name'] = Variable(senderKeyName); - map['sender_key'] = Variable(senderKey); + map['sender_key'] = Variable(senderKey); return map; } @@ -2580,7 +2581,7 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return SignalSenderKeyStoresData( senderKeyName: serializer.fromJson(json['senderKeyName']), - senderKey: serializer.fromJson(json['senderKey']), + senderKey: serializer.fromJson(json['senderKey']), ); } @override @@ -2588,12 +2589,12 @@ class SignalSenderKeyStoresData extends DataClass serializer ??= driftRuntimeOptions.defaultSerializer; return { 'senderKeyName': serializer.toJson(senderKeyName), - 'senderKey': serializer.toJson(senderKey), + 'senderKey': serializer.toJson(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 { final Value senderKeyName; - final Value senderKey; + final Value senderKey; final Value 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 custom({ Expression? senderKeyName, - Expression? senderKey, + Expression? senderKey, Expression? rowid, }) { return RawValuesInsertable({ @@ -2658,7 +2659,7 @@ class SignalSenderKeyStoresCompanion SignalSenderKeyStoresCompanion copyWith( {Value? senderKeyName, - Value? senderKey, + Value? senderKey, Value? rowid}) { return SignalSenderKeyStoresCompanion( senderKeyName: senderKeyName ?? this.senderKeyName, @@ -2674,7 +2675,7 @@ class SignalSenderKeyStoresCompanion map['sender_key_name'] = Variable(senderKeyName.value); } if (senderKey.present) { - map['sender_key'] = Variable(senderKey.value); + map['sender_key'] = Variable(senderKey.value); } if (rowid.present) { map['rowid'] = Variable(rowid.value); @@ -2705,8 +2706,8 @@ class SignalSessionStores extends Table late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - late final GeneratedColumn sessionRecord = - GeneratedColumn('session_record', aliasedName, false, + late final GeneratedColumn sessionRecord = + GeneratedColumn('session_record', aliasedName, false, type: DriftSqlType.blob, requiredDuringInsert: true); late final GeneratedColumn createdAt = GeneratedColumn( 'created_at', aliasedName, false, @@ -2750,7 +2751,7 @@ class SignalSessionStoresData extends DataClass implements Insertable { 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 = {}; map['device_id'] = Variable(deviceId); map['name'] = Variable(name); - map['session_record'] = Variable(sessionRecord); + map['session_record'] = Variable(sessionRecord); map['created_at'] = Variable(createdAt); return map; } @@ -2782,7 +2783,7 @@ class SignalSessionStoresData extends DataClass return SignalSessionStoresData( deviceId: serializer.fromJson(json['deviceId']), name: serializer.fromJson(json['name']), - sessionRecord: serializer.fromJson(json['sessionRecord']), + sessionRecord: serializer.fromJson(json['sessionRecord']), createdAt: serializer.fromJson(json['createdAt']), ); } @@ -2792,7 +2793,7 @@ class SignalSessionStoresData extends DataClass return { 'deviceId': serializer.toJson(deviceId), 'name': serializer.toJson(name), - 'sessionRecord': serializer.toJson(sessionRecord), + 'sessionRecord': serializer.toJson(sessionRecord), 'createdAt': serializer.toJson(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 { final Value deviceId; final Value name; - final Value sessionRecord; + final Value sessionRecord; final Value createdAt; final Value 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 custom({ Expression? deviceId, Expression? name, - Expression? sessionRecord, + Expression? sessionRecord, Expression? createdAt, Expression? rowid, }) { @@ -2885,7 +2886,7 @@ class SignalSessionStoresCompanion SignalSessionStoresCompanion copyWith( {Value? deviceId, Value? name, - Value? sessionRecord, + Value? sessionRecord, Value? createdAt, Value? rowid}) { return SignalSessionStoresCompanion( @@ -2907,7 +2908,7 @@ class SignalSessionStoresCompanion map['name'] = Variable(name.value); } if (sessionRecord.present) { - map['session_record'] = Variable(sessionRecord.value); + map['session_record'] = Variable(sessionRecord.value); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value);