diff --git a/.gitattributes b/.gitattributes index 65a69428c6..860181b751 100644 --- a/.gitattributes +++ b/.gitattributes @@ -69,6 +69,9 @@ **/pigeons/*.h linguist-generated **/pigeons/*.m linguist-generated +## Generated by Drift +**/*.drift.dart + ## Generated SDK files packages/**/lib/src/sdk/src/** linguist-generated diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart index 91d4b3b37f..6b83c0e9a9 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/queued_item_store/drift/drift_queued_item_store.g.dart @@ -180,6 +180,8 @@ class DriftQueuedItemsCompanion extends UpdateCompanion { abstract class _$DriftQueuedItemStore extends GeneratedDatabase { _$DriftQueuedItemStore(QueryExecutor e) : super(e); + _$DriftQueuedItemStoreManager get managers => + _$DriftQueuedItemStoreManager(this); late final $DriftQueuedItemsTable driftQueuedItems = $DriftQueuedItemsTable(this); @override @@ -188,3 +190,101 @@ abstract class _$DriftQueuedItemStore extends GeneratedDatabase { @override List get allSchemaEntities => [driftQueuedItems]; } + +typedef $$DriftQueuedItemsTableInsertCompanionBuilder + = DriftQueuedItemsCompanion Function({ + Value id, + required String value, +}); +typedef $$DriftQueuedItemsTableUpdateCompanionBuilder + = DriftQueuedItemsCompanion Function({ + Value id, + Value value, +}); + +class $$DriftQueuedItemsTableTableManager extends RootTableManager< + _$DriftQueuedItemStore, + $DriftQueuedItemsTable, + DriftQueuedItem, + $$DriftQueuedItemsTableFilterComposer, + $$DriftQueuedItemsTableOrderingComposer, + $$DriftQueuedItemsTableProcessedTableManager, + $$DriftQueuedItemsTableInsertCompanionBuilder, + $$DriftQueuedItemsTableUpdateCompanionBuilder> { + $$DriftQueuedItemsTableTableManager( + _$DriftQueuedItemStore db, $DriftQueuedItemsTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: + $$DriftQueuedItemsTableFilterComposer(ComposerState(db, table)), + orderingComposer: + $$DriftQueuedItemsTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => + $$DriftQueuedItemsTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value value = const Value.absent(), + }) => + DriftQueuedItemsCompanion( + id: id, + value: value, + ), + getInsertCompanionBuilder: ({ + Value id = const Value.absent(), + required String value, + }) => + DriftQueuedItemsCompanion.insert( + id: id, + value: value, + ), + )); +} + +class $$DriftQueuedItemsTableProcessedTableManager + extends ProcessedTableManager< + _$DriftQueuedItemStore, + $DriftQueuedItemsTable, + DriftQueuedItem, + $$DriftQueuedItemsTableFilterComposer, + $$DriftQueuedItemsTableOrderingComposer, + $$DriftQueuedItemsTableProcessedTableManager, + $$DriftQueuedItemsTableInsertCompanionBuilder, + $$DriftQueuedItemsTableUpdateCompanionBuilder> { + $$DriftQueuedItemsTableProcessedTableManager(super.$state); +} + +class $$DriftQueuedItemsTableFilterComposer + extends FilterComposer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { + $$DriftQueuedItemsTableFilterComposer(super.$state); + ColumnFilters get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get value => $state.composableBuilder( + column: $state.table.value, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$DriftQueuedItemsTableOrderingComposer + extends OrderingComposer<_$DriftQueuedItemStore, $DriftQueuedItemsTable> { + $$DriftQueuedItemsTableOrderingComposer(super.$state); + ColumnOrderings get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get value => $state.composableBuilder( + column: $state.table.value, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +class _$DriftQueuedItemStoreManager { + final _$DriftQueuedItemStore _db; + _$DriftQueuedItemStoreManager(this._db); + $$DriftQueuedItemsTableTableManager get driftQueuedItems => + $$DriftQueuedItemsTableTableManager(_db, _db.driftQueuedItems); +} diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml index 56da4ee521..8687c675bd 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: built_collection: ^5.0.0 built_value: ^8.6.0 collection: ^1.15.0 - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" intl: ">=0.18.0 <1.0.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" @@ -33,7 +33,7 @@ dev_dependencies: build_version: ^2.0.0 build_web_compilers: ^4.0.0 built_value_generator: 8.8.1 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" mocktail: ^1.0.0 test: ^1.22.1 diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml index cad6206142..ed4267c67a 100644 --- a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: fixnum: ^1.0.0 http: ">=0.13.0 <2.0.0" intl: ">=0.18.0 <1.0.0" - js: ^0.6.4 + js: ">=0.6.4 <0.8.0" json_annotation: ">=4.8.1 <4.9.0" meta: ^1.7.0 oauth2: ^2.0.2 diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml index 4a7097b34e..fc99dda344 100644 --- a/packages/aws_common/pubspec.yaml +++ b/packages/aws_common/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: built_value: ^8.6.0 collection: ^1.15.0 http2: ^2.0.0 - js: ^0.6.4 + js: ">=0.6.4 <0.8.0" json_annotation: ">=4.8.1 <4.9.0" logging: ^1.0.0 meta: ^1.7.0 diff --git a/packages/common/amplify_db_common/example/pubspec.yaml b/packages/common/amplify_db_common/example/pubspec.yaml index 63d0fd7afb..abda11ff4e 100644 --- a/packages/common/amplify_db_common/example/pubspec.yaml +++ b/packages/common/amplify_db_common/example/pubspec.yaml @@ -8,13 +8,13 @@ environment: dependencies: amplify_db_common: ">=0.4.0 <0.5.0" - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" flutter: sdk: flutter dev_dependencies: amplify_lints: ^2.0.0 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" build_runner: ^2.4.0 flutter_test: sdk: flutter diff --git a/packages/common/amplify_db_common/pubspec.yaml b/packages/common/amplify_db_common/pubspec.yaml index 1d4e42c61c..cd9611e2c3 100644 --- a/packages/common/amplify_db_common/pubspec.yaml +++ b/packages/common/amplify_db_common/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: amplify_db_common_dart: ">=0.4.3 <0.5.0" - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" flutter: sdk: flutter path: ">=1.8.0 <2.0.0" diff --git a/packages/common/amplify_db_common_dart/example/pubspec.yaml b/packages/common/amplify_db_common_dart/example/pubspec.yaml index a186a29d11..ff05006908 100644 --- a/packages/common/amplify_db_common_dart/example/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/example/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: amplify_db_common_dart: ">=0.4.0 <0.5.0" - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" example_common: path: ../../../example_common @@ -20,4 +20,4 @@ dev_dependencies: path: ../../../amplify_lints build_runner: ^2.4.0 build_web_compilers: ^4.0.0 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml index d669ac8036..83770d2df4 100644 --- a/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: amplify_core: ">=2.2.0 <2.3.0" async: ^2.10.0 aws_common: ">=0.7.0 <0.8.0" - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" sqlite3: ">=2.0.0 <2.4.3" @@ -22,5 +22,5 @@ dev_dependencies: build_runner: ^2.4.0 build_test: ^2.0.0 build_web_compilers: ^4.0.0 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" test: ^1.22.1 diff --git a/packages/common/amplify_db_common_dart/test/database.g.dart b/packages/common/amplify_db_common_dart/test/database.g.dart index 3f9bc53dbb..92b53f4d0b 100644 --- a/packages/common/amplify_db_common_dart/test/database.g.dart +++ b/packages/common/amplify_db_common_dart/test/database.g.dart @@ -434,6 +434,7 @@ class CategoriesCompanion extends UpdateCompanion { abstract class _$MyDatabase extends GeneratedDatabase { _$MyDatabase(QueryExecutor e) : super(e); + _$MyDatabaseManager get managers => _$MyDatabaseManager(this); late final $TodosTable todos = $TodosTable(this); late final $CategoriesTable categories = $CategoriesTable(this); @override @@ -442,3 +443,217 @@ abstract class _$MyDatabase extends GeneratedDatabase { @override List get allSchemaEntities => [todos, categories]; } + +typedef $$TodosTableInsertCompanionBuilder = TodosCompanion Function({ + Value id, + required String title, + required String content, + Value category, +}); +typedef $$TodosTableUpdateCompanionBuilder = TodosCompanion Function({ + Value id, + Value title, + Value content, + Value category, +}); + +class $$TodosTableTableManager extends RootTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableProcessedTableManager, + $$TodosTableInsertCompanionBuilder, + $$TodosTableUpdateCompanionBuilder> { + $$TodosTableTableManager(_$MyDatabase db, $TodosTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: + $$TodosTableFilterComposer(ComposerState(db, table)), + orderingComposer: + $$TodosTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => $$TodosTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value title = const Value.absent(), + Value content = const Value.absent(), + Value category = const Value.absent(), + }) => + TodosCompanion( + id: id, + title: title, + content: content, + category: category, + ), + getInsertCompanionBuilder: ({ + Value id = const Value.absent(), + required String title, + required String content, + Value category = const Value.absent(), + }) => + TodosCompanion.insert( + id: id, + title: title, + content: content, + category: category, + ), + )); +} + +class $$TodosTableProcessedTableManager extends ProcessedTableManager< + _$MyDatabase, + $TodosTable, + Todo, + $$TodosTableFilterComposer, + $$TodosTableOrderingComposer, + $$TodosTableProcessedTableManager, + $$TodosTableInsertCompanionBuilder, + $$TodosTableUpdateCompanionBuilder> { + $$TodosTableProcessedTableManager(super.$state); +} + +class $$TodosTableFilterComposer + extends FilterComposer<_$MyDatabase, $TodosTable> { + $$TodosTableFilterComposer(super.$state); + ColumnFilters get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get title => $state.composableBuilder( + column: $state.table.title, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get content => $state.composableBuilder( + column: $state.table.content, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get category => $state.composableBuilder( + column: $state.table.category, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$TodosTableOrderingComposer + extends OrderingComposer<_$MyDatabase, $TodosTable> { + $$TodosTableOrderingComposer(super.$state); + ColumnOrderings get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get title => $state.composableBuilder( + column: $state.table.title, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get content => $state.composableBuilder( + column: $state.table.content, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get category => $state.composableBuilder( + column: $state.table.category, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$CategoriesTableInsertCompanionBuilder = CategoriesCompanion Function({ + Value id, + required String description, +}); +typedef $$CategoriesTableUpdateCompanionBuilder = CategoriesCompanion Function({ + Value id, + Value description, +}); + +class $$CategoriesTableTableManager extends RootTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableProcessedTableManager, + $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder> { + $$CategoriesTableTableManager(_$MyDatabase db, $CategoriesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: + $$CategoriesTableFilterComposer(ComposerState(db, table)), + orderingComposer: + $$CategoriesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => + $$CategoriesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value id = const Value.absent(), + Value description = const Value.absent(), + }) => + CategoriesCompanion( + id: id, + description: description, + ), + getInsertCompanionBuilder: ({ + Value id = const Value.absent(), + required String description, + }) => + CategoriesCompanion.insert( + id: id, + description: description, + ), + )); +} + +class $$CategoriesTableProcessedTableManager extends ProcessedTableManager< + _$MyDatabase, + $CategoriesTable, + Category, + $$CategoriesTableFilterComposer, + $$CategoriesTableOrderingComposer, + $$CategoriesTableProcessedTableManager, + $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableUpdateCompanionBuilder> { + $$CategoriesTableProcessedTableManager(super.$state); +} + +class $$CategoriesTableFilterComposer + extends FilterComposer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableFilterComposer(super.$state); + ColumnFilters get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get description => $state.composableBuilder( + column: $state.table.description, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$CategoriesTableOrderingComposer + extends OrderingComposer<_$MyDatabase, $CategoriesTable> { + $$CategoriesTableOrderingComposer(super.$state); + ColumnOrderings get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get description => $state.composableBuilder( + column: $state.table.description, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +class _$MyDatabaseManager { + final _$MyDatabase _db; + _$MyDatabaseManager(this._db); + $$TodosTableTableManager get todos => + $$TodosTableTableManager(_db, _db.todos); + $$CategoriesTableTableManager get categories => + $$CategoriesTableTableManager(_db, _db.categories); +} diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index 54734d07f5..47d662530f 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: built_value: ^8.6.0 ffi: ^2.0.0 file: ">=6.0.0 <8.0.0" - js: ^0.6.4 + js: ">=0.6.4 <0.8.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" win32: ">=4.1.2 <6.0.0" diff --git a/packages/storage/amplify_storage_s3/example/pubspec.yaml b/packages/storage/amplify_storage_s3/example/pubspec.yaml index a4865932cd..f92cc97767 100644 --- a/packages/storage/amplify_storage_s3/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3/example/pubspec.yaml @@ -28,7 +28,7 @@ dev_dependencies: amplify_test: path: ../../../test/amplify_test aws_common: any - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" flutter_driver: sdk: flutter flutter_test: diff --git a/packages/storage/amplify_storage_s3_dart/build.yaml b/packages/storage/amplify_storage_s3_dart/build.yaml index 2a9825b1ca..698c41c701 100644 --- a/packages/storage/amplify_storage_s3_dart/build.yaml +++ b/packages/storage/amplify_storage_s3_dart/build.yaml @@ -3,3 +3,12 @@ targets: sources: exclude: - example/** + builders: + # default builder must be disabled in favor of the modular builder to + # work around https://github.com/simolus3/drift/issues/3034#issuecomment-2153463001 + drift_dev: + enabled: false + drift_dev:analyzer: + enabled: true + drift_dev:modular: + enabled: true diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.dart index b6a47491fa..a16a66bcf3 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.dart @@ -4,23 +4,23 @@ import 'package:amplify_core/amplify_core.dart'; import 'package:amplify_db_common_dart/amplify_db_common_dart.dart' as db_common; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/database_io.drift.dart'; import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/database_stub.dart' as stub; import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.dart'; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.drift.dart'; import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/transfer_record.dart' as data; import 'package:drift/drift.dart'; import 'package:meta/meta.dart'; -part 'database_io.g.dart'; - /// The name of database file created to persist [TransferRecords]. @internal const dataBaseName = 'amplify_storage_transfer_records'; /// {@macro amplify_storage_s3_dart.transfer_database} @DriftDatabase(tables: [TransferRecords]) -class TransferDatabase extends _$TransferDatabase +class TransferDatabase extends $TransferDatabase implements stub.TransferDatabase { /// {@macro amplify_storage_s3_dart.transfer_database} TransferDatabase(DependencyManager dependencies) diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart new file mode 100644 index 0000000000..9c87dfc276 --- /dev/null +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.drift.dart @@ -0,0 +1,23 @@ +// ignore_for_file: type=lint +import 'package:drift/drift.dart' as i0; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.drift.dart' + as i1; + +abstract class $TransferDatabase extends i0.GeneratedDatabase { + $TransferDatabase(i0.QueryExecutor e) : super(e); + $TransferDatabaseManager get managers => $TransferDatabaseManager(this); + late final i1.$TransferRecordsTable transferRecords = + i1.$TransferRecordsTable(this); + @override + Iterable> get allTables => + allSchemaEntities.whereType>(); + @override + List get allSchemaEntities => [transferRecords]; +} + +class $TransferDatabaseManager { + final $TransferDatabase _db; + $TransferDatabaseManager(this._db); + i1.$$TransferRecordsTableTableManager get transferRecords => + i1.$$TransferRecordsTableTableManager(_db, _db.transferRecords); +} diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.g.dart deleted file mode 100644 index ac0ce888d7..0000000000 --- a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/database_io.g.dart +++ /dev/null @@ -1,271 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'database_io.dart'; - -// ignore_for_file: type=lint -class $TransferRecordsTable extends TransferRecords - with TableInfo<$TransferRecordsTable, TransferRecord> { - @override - final GeneratedDatabase attachedDatabase; - final String? _alias; - $TransferRecordsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); - @override - late final GeneratedColumn id = GeneratedColumn( - 'id', aliasedName, false, - hasAutoIncrement: true, - type: DriftSqlType.int, - requiredDuringInsert: false, - defaultConstraints: - GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); - static const VerificationMeta _uploadIdMeta = - const VerificationMeta('uploadId'); - @override - late final GeneratedColumn uploadId = GeneratedColumn( - 'upload_id', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _objectKeyMeta = - const VerificationMeta('objectKey'); - @override - late final GeneratedColumn objectKey = GeneratedColumn( - 'object_key', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _createdAtMeta = - const VerificationMeta('createdAt'); - @override - late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); - @override - List get $columns => [id, uploadId, objectKey, createdAt]; - @override - String get aliasedName => _alias ?? actualTableName; - @override - String get actualTableName => $name; - static const String $name = 'transfer_records'; - @override - VerificationContext validateIntegrity(Insertable instance, - {bool isInserting = false}) { - final context = VerificationContext(); - final data = instance.toColumns(true); - if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); - } - if (data.containsKey('upload_id')) { - context.handle(_uploadIdMeta, - uploadId.isAcceptableOrUnknown(data['upload_id']!, _uploadIdMeta)); - } else if (isInserting) { - context.missing(_uploadIdMeta); - } - if (data.containsKey('object_key')) { - context.handle(_objectKeyMeta, - objectKey.isAcceptableOrUnknown(data['object_key']!, _objectKeyMeta)); - } else if (isInserting) { - context.missing(_objectKeyMeta); - } - if (data.containsKey('created_at')) { - context.handle(_createdAtMeta, - createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); - } else if (isInserting) { - context.missing(_createdAtMeta); - } - return context; - } - - @override - Set get $primaryKey => {id}; - @override - TransferRecord map(Map data, {String? tablePrefix}) { - final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return TransferRecord( - id: attachedDatabase.typeMapping - .read(DriftSqlType.int, data['${effectivePrefix}id'])!, - uploadId: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}upload_id'])!, - objectKey: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}object_key'])!, - createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}created_at'])!, - ); - } - - @override - $TransferRecordsTable createAlias(String alias) { - return $TransferRecordsTable(attachedDatabase, alias); - } -} - -class TransferRecord extends DataClass implements Insertable { - /// The record id. - final int id; - - /// The multipart upload id. - final String uploadId; - - /// The object key associated with the [uploadId]. - final String objectKey; - - /// Timestamp of [uploadId] creation. - final String createdAt; - const TransferRecord( - {required this.id, - required this.uploadId, - required this.objectKey, - required this.createdAt}); - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - map['id'] = Variable(id); - map['upload_id'] = Variable(uploadId); - map['object_key'] = Variable(objectKey); - map['created_at'] = Variable(createdAt); - return map; - } - - TransferRecordsCompanion toCompanion(bool nullToAbsent) { - return TransferRecordsCompanion( - id: Value(id), - uploadId: Value(uploadId), - objectKey: Value(objectKey), - createdAt: Value(createdAt), - ); - } - - factory TransferRecord.fromJson(Map json, - {ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return TransferRecord( - id: serializer.fromJson(json['id']), - uploadId: serializer.fromJson(json['uploadId']), - objectKey: serializer.fromJson(json['objectKey']), - createdAt: serializer.fromJson(json['createdAt']), - ); - } - @override - Map toJson({ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return { - 'id': serializer.toJson(id), - 'uploadId': serializer.toJson(uploadId), - 'objectKey': serializer.toJson(objectKey), - 'createdAt': serializer.toJson(createdAt), - }; - } - - TransferRecord copyWith( - {int? id, String? uploadId, String? objectKey, String? createdAt}) => - TransferRecord( - id: id ?? this.id, - uploadId: uploadId ?? this.uploadId, - objectKey: objectKey ?? this.objectKey, - createdAt: createdAt ?? this.createdAt, - ); - @override - String toString() { - return (StringBuffer('TransferRecord(') - ..write('id: $id, ') - ..write('uploadId: $uploadId, ') - ..write('objectKey: $objectKey, ') - ..write('createdAt: $createdAt') - ..write(')')) - .toString(); - } - - @override - int get hashCode => Object.hash(id, uploadId, objectKey, createdAt); - @override - bool operator ==(Object other) => - identical(this, other) || - (other is TransferRecord && - other.id == this.id && - other.uploadId == this.uploadId && - other.objectKey == this.objectKey && - other.createdAt == this.createdAt); -} - -class TransferRecordsCompanion extends UpdateCompanion { - final Value id; - final Value uploadId; - final Value objectKey; - final Value createdAt; - const TransferRecordsCompanion({ - this.id = const Value.absent(), - this.uploadId = const Value.absent(), - this.objectKey = const Value.absent(), - this.createdAt = const Value.absent(), - }); - TransferRecordsCompanion.insert({ - this.id = const Value.absent(), - required String uploadId, - required String objectKey, - required String createdAt, - }) : uploadId = Value(uploadId), - objectKey = Value(objectKey), - createdAt = Value(createdAt); - static Insertable custom({ - Expression? id, - Expression? uploadId, - Expression? objectKey, - Expression? createdAt, - }) { - return RawValuesInsertable({ - if (id != null) 'id': id, - if (uploadId != null) 'upload_id': uploadId, - if (objectKey != null) 'object_key': objectKey, - if (createdAt != null) 'created_at': createdAt, - }); - } - - TransferRecordsCompanion copyWith( - {Value? id, - Value? uploadId, - Value? objectKey, - Value? createdAt}) { - return TransferRecordsCompanion( - id: id ?? this.id, - uploadId: uploadId ?? this.uploadId, - objectKey: objectKey ?? this.objectKey, - createdAt: createdAt ?? this.createdAt, - ); - } - - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - if (id.present) { - map['id'] = Variable(id.value); - } - if (uploadId.present) { - map['upload_id'] = Variable(uploadId.value); - } - if (objectKey.present) { - map['object_key'] = Variable(objectKey.value); - } - if (createdAt.present) { - map['created_at'] = Variable(createdAt.value); - } - return map; - } - - @override - String toString() { - return (StringBuffer('TransferRecordsCompanion(') - ..write('id: $id, ') - ..write('uploadId: $uploadId, ') - ..write('objectKey: $objectKey, ') - ..write('createdAt: $createdAt') - ..write(')')) - .toString(); - } -} - -abstract class _$TransferDatabase extends GeneratedDatabase { - _$TransferDatabase(QueryExecutor e) : super(e); - late final $TransferRecordsTable transferRecords = - $TransferRecordsTable(this); - @override - Iterable> get allTables => - allSchemaEntities.whereType>(); - @override - List get allSchemaEntities => [transferRecords]; -} diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart new file mode 100644 index 0000000000..30ebd91612 --- /dev/null +++ b/packages/storage/amplify_storage_s3_dart/lib/src/storage_s3_service/transfer/database/tables.drift.dart @@ -0,0 +1,387 @@ +// ignore_for_file: type=lint +import 'package:drift/drift.dart' as i0; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.drift.dart' + as i1; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.dart' + as i2; + +class $TransferRecordsTable extends i2.TransferRecords + with i0.TableInfo<$TransferRecordsTable, i1.TransferRecord> { + @override + final i0.GeneratedDatabase attachedDatabase; + final String? _alias; + $TransferRecordsTable(this.attachedDatabase, [this._alias]); + static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id'); + @override + late final i0.GeneratedColumn id = i0.GeneratedColumn( + 'id', aliasedName, false, + hasAutoIncrement: true, + type: i0.DriftSqlType.int, + requiredDuringInsert: false, + defaultConstraints: + i0.GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT')); + static const i0.VerificationMeta _uploadIdMeta = + const i0.VerificationMeta('uploadId'); + @override + late final i0.GeneratedColumn uploadId = i0.GeneratedColumn( + 'upload_id', aliasedName, false, + type: i0.DriftSqlType.string, requiredDuringInsert: true); + static const i0.VerificationMeta _objectKeyMeta = + const i0.VerificationMeta('objectKey'); + @override + late final i0.GeneratedColumn objectKey = i0.GeneratedColumn( + 'object_key', aliasedName, false, + type: i0.DriftSqlType.string, requiredDuringInsert: true); + static const i0.VerificationMeta _createdAtMeta = + const i0.VerificationMeta('createdAt'); + @override + late final i0.GeneratedColumn createdAt = i0.GeneratedColumn( + 'created_at', aliasedName, false, + type: i0.DriftSqlType.string, requiredDuringInsert: true); + @override + List get $columns => [id, uploadId, objectKey, createdAt]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'transfer_records'; + @override + i0.VerificationContext validateIntegrity( + i0.Insertable instance, + {bool isInserting = false}) { + final context = i0.VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } + if (data.containsKey('upload_id')) { + context.handle(_uploadIdMeta, + uploadId.isAcceptableOrUnknown(data['upload_id']!, _uploadIdMeta)); + } else if (isInserting) { + context.missing(_uploadIdMeta); + } + if (data.containsKey('object_key')) { + context.handle(_objectKeyMeta, + objectKey.isAcceptableOrUnknown(data['object_key']!, _objectKeyMeta)); + } else if (isInserting) { + context.missing(_objectKeyMeta); + } + if (data.containsKey('created_at')) { + context.handle(_createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); + } else if (isInserting) { + context.missing(_createdAtMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + i1.TransferRecord map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return i1.TransferRecord( + id: attachedDatabase.typeMapping + .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!, + uploadId: attachedDatabase.typeMapping + .read(i0.DriftSqlType.string, data['${effectivePrefix}upload_id'])!, + objectKey: attachedDatabase.typeMapping + .read(i0.DriftSqlType.string, data['${effectivePrefix}object_key'])!, + createdAt: attachedDatabase.typeMapping + .read(i0.DriftSqlType.string, data['${effectivePrefix}created_at'])!, + ); + } + + @override + $TransferRecordsTable createAlias(String alias) { + return $TransferRecordsTable(attachedDatabase, alias); + } +} + +class TransferRecord extends i0.DataClass + implements i0.Insertable { + /// The record id. + final int id; + + /// The multipart upload id. + final String uploadId; + + /// The object key associated with the [uploadId]. + final String objectKey; + + /// Timestamp of [uploadId] creation. + final String createdAt; + const TransferRecord( + {required this.id, + required this.uploadId, + required this.objectKey, + required this.createdAt}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = i0.Variable(id); + map['upload_id'] = i0.Variable(uploadId); + map['object_key'] = i0.Variable(objectKey); + map['created_at'] = i0.Variable(createdAt); + return map; + } + + i1.TransferRecordsCompanion toCompanion(bool nullToAbsent) { + return i1.TransferRecordsCompanion( + id: i0.Value(id), + uploadId: i0.Value(uploadId), + objectKey: i0.Value(objectKey), + createdAt: i0.Value(createdAt), + ); + } + + factory TransferRecord.fromJson(Map json, + {i0.ValueSerializer? serializer}) { + serializer ??= i0.driftRuntimeOptions.defaultSerializer; + return TransferRecord( + id: serializer.fromJson(json['id']), + uploadId: serializer.fromJson(json['uploadId']), + objectKey: serializer.fromJson(json['objectKey']), + createdAt: serializer.fromJson(json['createdAt']), + ); + } + @override + Map toJson({i0.ValueSerializer? serializer}) { + serializer ??= i0.driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'uploadId': serializer.toJson(uploadId), + 'objectKey': serializer.toJson(objectKey), + 'createdAt': serializer.toJson(createdAt), + }; + } + + i1.TransferRecord copyWith( + {int? id, String? uploadId, String? objectKey, String? createdAt}) => + i1.TransferRecord( + id: id ?? this.id, + uploadId: uploadId ?? this.uploadId, + objectKey: objectKey ?? this.objectKey, + createdAt: createdAt ?? this.createdAt, + ); + @override + String toString() { + return (StringBuffer('TransferRecord(') + ..write('id: $id, ') + ..write('uploadId: $uploadId, ') + ..write('objectKey: $objectKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, uploadId, objectKey, createdAt); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is i1.TransferRecord && + other.id == this.id && + other.uploadId == this.uploadId && + other.objectKey == this.objectKey && + other.createdAt == this.createdAt); +} + +class TransferRecordsCompanion extends i0.UpdateCompanion { + final i0.Value id; + final i0.Value uploadId; + final i0.Value objectKey; + final i0.Value createdAt; + const TransferRecordsCompanion({ + this.id = const i0.Value.absent(), + this.uploadId = const i0.Value.absent(), + this.objectKey = const i0.Value.absent(), + this.createdAt = const i0.Value.absent(), + }); + TransferRecordsCompanion.insert({ + this.id = const i0.Value.absent(), + required String uploadId, + required String objectKey, + required String createdAt, + }) : uploadId = i0.Value(uploadId), + objectKey = i0.Value(objectKey), + createdAt = i0.Value(createdAt); + static i0.Insertable custom({ + i0.Expression? id, + i0.Expression? uploadId, + i0.Expression? objectKey, + i0.Expression? createdAt, + }) { + return i0.RawValuesInsertable({ + if (id != null) 'id': id, + if (uploadId != null) 'upload_id': uploadId, + if (objectKey != null) 'object_key': objectKey, + if (createdAt != null) 'created_at': createdAt, + }); + } + + i1.TransferRecordsCompanion copyWith( + {i0.Value? id, + i0.Value? uploadId, + i0.Value? objectKey, + i0.Value? createdAt}) { + return i1.TransferRecordsCompanion( + id: id ?? this.id, + uploadId: uploadId ?? this.uploadId, + objectKey: objectKey ?? this.objectKey, + createdAt: createdAt ?? this.createdAt, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = i0.Variable(id.value); + } + if (uploadId.present) { + map['upload_id'] = i0.Variable(uploadId.value); + } + if (objectKey.present) { + map['object_key'] = i0.Variable(objectKey.value); + } + if (createdAt.present) { + map['created_at'] = i0.Variable(createdAt.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('TransferRecordsCompanion(') + ..write('id: $id, ') + ..write('uploadId: $uploadId, ') + ..write('objectKey: $objectKey, ') + ..write('createdAt: $createdAt') + ..write(')')) + .toString(); + } +} + +typedef $$TransferRecordsTableInsertCompanionBuilder + = i1.TransferRecordsCompanion Function({ + i0.Value id, + required String uploadId, + required String objectKey, + required String createdAt, +}); +typedef $$TransferRecordsTableUpdateCompanionBuilder + = i1.TransferRecordsCompanion Function({ + i0.Value id, + i0.Value uploadId, + i0.Value objectKey, + i0.Value createdAt, +}); + +class $$TransferRecordsTableTableManager extends i0.RootTableManager< + i0.GeneratedDatabase, + i1.$TransferRecordsTable, + i1.TransferRecord, + i1.$$TransferRecordsTableFilterComposer, + i1.$$TransferRecordsTableOrderingComposer, + $$TransferRecordsTableProcessedTableManager, + $$TransferRecordsTableInsertCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder> { + $$TransferRecordsTableTableManager( + i0.GeneratedDatabase db, i1.$TransferRecordsTable table) + : super(i0.TableManagerState( + db: db, + table: table, + filteringComposer: i1.$$TransferRecordsTableFilterComposer( + i0.ComposerState(db, table)), + orderingComposer: i1.$$TransferRecordsTableOrderingComposer( + i0.ComposerState(db, table)), + getChildManagerBuilder: (p) => + $$TransferRecordsTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + i0.Value id = const i0.Value.absent(), + i0.Value uploadId = const i0.Value.absent(), + i0.Value objectKey = const i0.Value.absent(), + i0.Value createdAt = const i0.Value.absent(), + }) => + i1.TransferRecordsCompanion( + id: id, + uploadId: uploadId, + objectKey: objectKey, + createdAt: createdAt, + ), + getInsertCompanionBuilder: ({ + i0.Value id = const i0.Value.absent(), + required String uploadId, + required String objectKey, + required String createdAt, + }) => + i1.TransferRecordsCompanion.insert( + id: id, + uploadId: uploadId, + objectKey: objectKey, + createdAt: createdAt, + ), + )); +} + +class $$TransferRecordsTableProcessedTableManager + extends i0.ProcessedTableManager< + i0.GeneratedDatabase, + i1.$TransferRecordsTable, + i1.TransferRecord, + i1.$$TransferRecordsTableFilterComposer, + i1.$$TransferRecordsTableOrderingComposer, + $$TransferRecordsTableProcessedTableManager, + $$TransferRecordsTableInsertCompanionBuilder, + $$TransferRecordsTableUpdateCompanionBuilder> { + $$TransferRecordsTableProcessedTableManager(super.$state); +} + +class $$TransferRecordsTableFilterComposer + extends i0.FilterComposer { + $$TransferRecordsTableFilterComposer(super.$state); + i0.ColumnFilters get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + i0.ColumnFilters(column, joinBuilders: joinBuilders)); + + i0.ColumnFilters get uploadId => $state.composableBuilder( + column: $state.table.uploadId, + builder: (column, joinBuilders) => + i0.ColumnFilters(column, joinBuilders: joinBuilders)); + + i0.ColumnFilters get objectKey => $state.composableBuilder( + column: $state.table.objectKey, + builder: (column, joinBuilders) => + i0.ColumnFilters(column, joinBuilders: joinBuilders)); + + i0.ColumnFilters get createdAt => $state.composableBuilder( + column: $state.table.createdAt, + builder: (column, joinBuilders) => + i0.ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$TransferRecordsTableOrderingComposer extends i0 + .OrderingComposer { + $$TransferRecordsTableOrderingComposer(super.$state); + i0.ColumnOrderings get id => $state.composableBuilder( + column: $state.table.id, + builder: (column, joinBuilders) => + i0.ColumnOrderings(column, joinBuilders: joinBuilders)); + + i0.ColumnOrderings get uploadId => $state.composableBuilder( + column: $state.table.uploadId, + builder: (column, joinBuilders) => + i0.ColumnOrderings(column, joinBuilders: joinBuilders)); + + i0.ColumnOrderings get objectKey => $state.composableBuilder( + column: $state.table.objectKey, + builder: (column, joinBuilders) => + i0.ColumnOrderings(column, joinBuilders: joinBuilders)); + + i0.ColumnOrderings get createdAt => $state.composableBuilder( + column: $state.table.createdAt, + builder: (column, joinBuilders) => + i0.ColumnOrderings(column, joinBuilders: joinBuilders)); +} diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml index c2fb82905c..23dfe383e1 100644 --- a/packages/storage/amplify_storage_s3_dart/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: aws_signature_v4: ">=0.6.0 <0.7.0" built_collection: ^5.0.0 built_value: ^8.6.0 - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" fixnum: ^1.0.0 json_annotation: ">=4.8.1 <4.9.0" meta: ^1.7.0 @@ -29,7 +29,7 @@ dev_dependencies: build_runner: ^2.4.0 build_verify: ^3.0.0 built_value_generator: 8.8.1 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" json_serializable: 6.7.1 mocktail: ^1.0.0 test: ^1.22.1 diff --git a/packages/test/pub_server/lib/src/database.g.dart b/packages/test/pub_server/lib/src/database.g.dart index 6d7fa43e66..6387001704 100644 --- a/packages/test/pub_server/lib/src/database.g.dart +++ b/packages/test/pub_server/lib/src/database.g.dart @@ -8,12 +8,12 @@ class $PackagesTable extends Packages with TableInfo<$PackagesTable, Package> { final GeneratedDatabase attachedDatabase; final String? _alias; $PackagesTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _nameMeta = VerificationMeta('name'); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); @override late final GeneratedColumn name = GeneratedColumn( 'name', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _latestMeta = VerificationMeta('latest'); + static const VerificationMeta _latestMeta = const VerificationMeta('latest'); @override late final GeneratedColumn latest = GeneratedColumn( 'latest', aliasedName, false, @@ -21,9 +21,10 @@ class $PackagesTable extends Packages with TableInfo<$PackagesTable, Package> { @override List get $columns => [name, latest]; @override - String get aliasedName => _alias ?? 'packages'; + String get aliasedName => _alias ?? actualTableName; @override - String get actualTableName => 'packages'; + String get actualTableName => $name; + static const String $name = 'packages'; @override VerificationContext validateIntegrity(Insertable instance, {bool isInserting = false}) { @@ -190,38 +191,43 @@ class $PackageVersionsTable extends PackageVersions final GeneratedDatabase attachedDatabase; final String? _alias; $PackageVersionsTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _packageMeta = VerificationMeta('package'); + static const VerificationMeta _packageMeta = + const VerificationMeta('package'); @override late final GeneratedColumn package = GeneratedColumn( 'package', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _versionMeta = VerificationMeta('version'); + static const VerificationMeta _versionMeta = + const VerificationMeta('version'); @override late final GeneratedColumn version = GeneratedColumn( 'version', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); static const VerificationMeta _archiveUrlMeta = - VerificationMeta('archiveUrl'); + const VerificationMeta('archiveUrl'); @override late final GeneratedColumn archiveUrl = GeneratedColumn( 'archive_url', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _pubspecMeta = VerificationMeta('pubspec'); + static const VerificationMeta _pubspecMeta = + const VerificationMeta('pubspec'); @override late final GeneratedColumn pubspec = GeneratedColumn( 'pubspec', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _readmeMeta = VerificationMeta('readme'); + static const VerificationMeta _readmeMeta = const VerificationMeta('readme'); @override late final GeneratedColumn readme = GeneratedColumn( 'readme', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _changelogMeta = VerificationMeta('changelog'); + static const VerificationMeta _changelogMeta = + const VerificationMeta('changelog'); @override late final GeneratedColumn changelog = GeneratedColumn( 'changelog', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _publishedMeta = VerificationMeta('published'); + static const VerificationMeta _publishedMeta = + const VerificationMeta('published'); @override late final GeneratedColumn published = GeneratedColumn( 'published', aliasedName, false, @@ -230,9 +236,10 @@ class $PackageVersionsTable extends PackageVersions List get $columns => [package, version, archiveUrl, pubspec, readme, changelog, published]; @override - String get aliasedName => _alias ?? 'package_versions'; + String get aliasedName => _alias ?? actualTableName; @override - String get actualTableName => 'package_versions'; + String get actualTableName => $name; + static const String $name = 'package_versions'; @override VerificationContext validateIntegrity(Insertable instance, {bool isInserting = false}) { @@ -555,6 +562,7 @@ class PackageVersionsCompanion extends UpdateCompanion { abstract class _$PubDatabase extends GeneratedDatabase { _$PubDatabase(QueryExecutor e) : super(e); + _$PubDatabaseManager get managers => _$PubDatabaseManager(this); late final $PackagesTable packages = $PackagesTable(this); late final $PackageVersionsTable packageVersions = $PackageVersionsTable(this); @@ -565,3 +573,281 @@ abstract class _$PubDatabase extends GeneratedDatabase { List get allSchemaEntities => [packages, packageVersions]; } + +typedef $$PackagesTableInsertCompanionBuilder = PackagesCompanion Function({ + required String name, + required String latest, + Value rowid, +}); +typedef $$PackagesTableUpdateCompanionBuilder = PackagesCompanion Function({ + Value name, + Value latest, + Value rowid, +}); + +class $$PackagesTableTableManager extends RootTableManager< + _$PubDatabase, + $PackagesTable, + Package, + $$PackagesTableFilterComposer, + $$PackagesTableOrderingComposer, + $$PackagesTableProcessedTableManager, + $$PackagesTableInsertCompanionBuilder, + $$PackagesTableUpdateCompanionBuilder> { + $$PackagesTableTableManager(_$PubDatabase db, $PackagesTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: + $$PackagesTableFilterComposer(ComposerState(db, table)), + orderingComposer: + $$PackagesTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => + $$PackagesTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value name = const Value.absent(), + Value latest = const Value.absent(), + Value rowid = const Value.absent(), + }) => + PackagesCompanion( + name: name, + latest: latest, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required String name, + required String latest, + Value rowid = const Value.absent(), + }) => + PackagesCompanion.insert( + name: name, + latest: latest, + rowid: rowid, + ), + )); +} + +class $$PackagesTableProcessedTableManager extends ProcessedTableManager< + _$PubDatabase, + $PackagesTable, + Package, + $$PackagesTableFilterComposer, + $$PackagesTableOrderingComposer, + $$PackagesTableProcessedTableManager, + $$PackagesTableInsertCompanionBuilder, + $$PackagesTableUpdateCompanionBuilder> { + $$PackagesTableProcessedTableManager(super.$state); +} + +class $$PackagesTableFilterComposer + extends FilterComposer<_$PubDatabase, $PackagesTable> { + $$PackagesTableFilterComposer(super.$state); + ColumnFilters get name => $state.composableBuilder( + column: $state.table.name, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get latest => $state.composableBuilder( + column: $state.table.latest, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$PackagesTableOrderingComposer + extends OrderingComposer<_$PubDatabase, $PackagesTable> { + $$PackagesTableOrderingComposer(super.$state); + ColumnOrderings get name => $state.composableBuilder( + column: $state.table.name, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get latest => $state.composableBuilder( + column: $state.table.latest, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +typedef $$PackageVersionsTableInsertCompanionBuilder = PackageVersionsCompanion + Function({ + required String package, + required String version, + required String archiveUrl, + required String pubspec, + required String readme, + required String changelog, + required DateTime published, + Value rowid, +}); +typedef $$PackageVersionsTableUpdateCompanionBuilder = PackageVersionsCompanion + Function({ + Value package, + Value version, + Value archiveUrl, + Value pubspec, + Value readme, + Value changelog, + Value published, + Value rowid, +}); + +class $$PackageVersionsTableTableManager extends RootTableManager< + _$PubDatabase, + $PackageVersionsTable, + PackageVersion, + $$PackageVersionsTableFilterComposer, + $$PackageVersionsTableOrderingComposer, + $$PackageVersionsTableProcessedTableManager, + $$PackageVersionsTableInsertCompanionBuilder, + $$PackageVersionsTableUpdateCompanionBuilder> { + $$PackageVersionsTableTableManager( + _$PubDatabase db, $PackageVersionsTable table) + : super(TableManagerState( + db: db, + table: table, + filteringComposer: + $$PackageVersionsTableFilterComposer(ComposerState(db, table)), + orderingComposer: + $$PackageVersionsTableOrderingComposer(ComposerState(db, table)), + getChildManagerBuilder: (p) => + $$PackageVersionsTableProcessedTableManager(p), + getUpdateCompanionBuilder: ({ + Value package = const Value.absent(), + Value version = const Value.absent(), + Value archiveUrl = const Value.absent(), + Value pubspec = const Value.absent(), + Value readme = const Value.absent(), + Value changelog = const Value.absent(), + Value published = const Value.absent(), + Value rowid = const Value.absent(), + }) => + PackageVersionsCompanion( + package: package, + version: version, + archiveUrl: archiveUrl, + pubspec: pubspec, + readme: readme, + changelog: changelog, + published: published, + rowid: rowid, + ), + getInsertCompanionBuilder: ({ + required String package, + required String version, + required String archiveUrl, + required String pubspec, + required String readme, + required String changelog, + required DateTime published, + Value rowid = const Value.absent(), + }) => + PackageVersionsCompanion.insert( + package: package, + version: version, + archiveUrl: archiveUrl, + pubspec: pubspec, + readme: readme, + changelog: changelog, + published: published, + rowid: rowid, + ), + )); +} + +class $$PackageVersionsTableProcessedTableManager extends ProcessedTableManager< + _$PubDatabase, + $PackageVersionsTable, + PackageVersion, + $$PackageVersionsTableFilterComposer, + $$PackageVersionsTableOrderingComposer, + $$PackageVersionsTableProcessedTableManager, + $$PackageVersionsTableInsertCompanionBuilder, + $$PackageVersionsTableUpdateCompanionBuilder> { + $$PackageVersionsTableProcessedTableManager(super.$state); +} + +class $$PackageVersionsTableFilterComposer + extends FilterComposer<_$PubDatabase, $PackageVersionsTable> { + $$PackageVersionsTableFilterComposer(super.$state); + ColumnFilters get package => $state.composableBuilder( + column: $state.table.package, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get version => $state.composableBuilder( + column: $state.table.version, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get archiveUrl => $state.composableBuilder( + column: $state.table.archiveUrl, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get pubspec => $state.composableBuilder( + column: $state.table.pubspec, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get readme => $state.composableBuilder( + column: $state.table.readme, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get changelog => $state.composableBuilder( + column: $state.table.changelog, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); + + ColumnFilters get published => $state.composableBuilder( + column: $state.table.published, + builder: (column, joinBuilders) => + ColumnFilters(column, joinBuilders: joinBuilders)); +} + +class $$PackageVersionsTableOrderingComposer + extends OrderingComposer<_$PubDatabase, $PackageVersionsTable> { + $$PackageVersionsTableOrderingComposer(super.$state); + ColumnOrderings get package => $state.composableBuilder( + column: $state.table.package, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get version => $state.composableBuilder( + column: $state.table.version, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get archiveUrl => $state.composableBuilder( + column: $state.table.archiveUrl, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get pubspec => $state.composableBuilder( + column: $state.table.pubspec, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get readme => $state.composableBuilder( + column: $state.table.readme, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get changelog => $state.composableBuilder( + column: $state.table.changelog, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); + + ColumnOrderings get published => $state.composableBuilder( + column: $state.table.published, + builder: (column, joinBuilders) => + ColumnOrderings(column, joinBuilders: joinBuilders)); +} + +class _$PubDatabaseManager { + final _$PubDatabase _db; + _$PubDatabaseManager(this._db); + $$PackagesTableTableManager get packages => + $$PackagesTableTableManager(_db, _db.packages); + $$PackageVersionsTableTableManager get packageVersions => + $$PackageVersionsTableTableManager(_db, _db.packageVersions); +} diff --git a/packages/test/pub_server/pubspec.yaml b/packages/test/pub_server/pubspec.yaml index 00372f0e36..45cfff3a31 100644 --- a/packages/test/pub_server/pubspec.yaml +++ b/packages/test/pub_server/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: async: ^2.10.0 aws_common: any collection: ^1.15.0 - drift: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" file: ">=6.0.0 <8.0.0" git: ^2.2.0 graphs: ^2.1.0 @@ -31,7 +31,7 @@ dependencies: dev_dependencies: amplify_lints: ">=2.0.3 <2.1.0" build_runner: ^2.4.0 - drift_dev: ">=2.14.0 <2.15.0" + drift_dev: ">=2.18.0 <2.19.0" json_serializable: 6.7.1 pub_api_client: ">=2.4.0 <2.7.0" # v2.7.0 introduces a new required field - archive_sha256 shelf_router_generator: ^1.0.5 diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml index b292e871bc..c134739642 100644 --- a/packages/worker_bee/worker_bee/pubspec.yaml +++ b/packages/worker_bee/worker_bee/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: built_collection: ^5.0.0 built_value: ^8.6.0 collection: ^1.15.0 - js: ^0.6.4 + js: ">=0.6.4 <0.8.0" meta: ^1.7.0 path: ">=1.8.0 <2.0.0" stack_trace: ^1.10.0 diff --git a/packages/worker_bee/worker_bee_builder/lib/src/hive_generator.dart b/packages/worker_bee/worker_bee_builder/lib/src/hive_generator.dart index 334e63d758..bf243b9603 100644 --- a/packages/worker_bee/worker_bee_builder/lib/src/hive_generator.dart +++ b/packages/worker_bee/worker_bee_builder/lib/src/hive_generator.dart @@ -39,6 +39,8 @@ class WorkerHiveGenerator extends GeneratorForAnnotation { ..assignment = literalMap( { for (final workerType in workers) + // TODO(Jordan-Nelson): remove use of `withNullability` when min dart version is 3.4 or higher + // ignore: deprecated_member_use workerType.getDisplayString(withNullability: false): Block.of([ (workerType.accept(_symbolVisitor) as TypeReference) diff --git a/packages/worker_bee/worker_bee_builder/lib/src/worker_generator.dart b/packages/worker_bee/worker_bee_builder/lib/src/worker_generator.dart index 123931d94f..9591004095 100644 --- a/packages/worker_bee/worker_bee_builder/lib/src/worker_generator.dart +++ b/packages/worker_bee/worker_bee_builder/lib/src/worker_generator.dart @@ -56,6 +56,8 @@ class WorkerBeeGenerator extends GeneratorForAnnotation { final requestTypeEl = requestType.element; if (requestTypeEl == null || requestTypeEl is! ClassElement) { final requestTypeName = + // TODO(Jordan-Nelson): remove use of `withNullability` when min dart version is 3.4 or higher + // ignore: deprecated_member_use requestType.getDisplayString(withNullability: true); throw ArgumentError('Could not find element for $requestTypeName.'); } diff --git a/pubspec.yaml b/pubspec.yaml index fda5c52fd4..b2919a1a8d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: none # The current constraints for Dart and Flutter SDKs. environment: sdk: ^3.3.0 - flutter: '>=3.19.0' + flutter: ">=3.19.0" # Global dependency versions for third-party dependencies of # Amplify Flutter projects. These represent the values which @@ -25,8 +25,8 @@ dependencies: # on stable so that CI checks pass for generated code. dart_style: ^2.3.2 device_info_plus: ^10.0.1 - drift: ">=2.14.0 <2.15.0" - drift_dev: ">=2.14.0 <2.15.0" + drift: ">=2.18.0 <2.19.0" + drift_dev: ">=2.18.0 <2.19.0" ffigen: ^9.0.0 file: ">=6.0.0 <8.0.0" flutter_plugin_android_lifecycle: ^2.0.9