From c9be62814e9231b63b90935df5c12546b8be0ef8 Mon Sep 17 00:00:00 2001 From: Tyler-Larkin Date: Thu, 13 Feb 2025 14:02:40 -0800 Subject: [PATCH] chore(): Regenerated Drift Tables --- .../amplify_db_common_dart/pubspec.yaml | 2 +- .../data/repo_snapshot/pubspec.yaml | 2 +- .../lib/src/version.dart | 2 +- .../amplify_db_common/example/lib/db.g.dart | 130 ++++++++++++++++++ .../amplify_db_common_dart/pubspec.yaml | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + .../transfer/database/tables.drift.dart | 43 +++++- pubspec.yaml | 2 +- 8 files changed, 177 insertions(+), 8 deletions(-) diff --git a/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml index 9c729b5ba2..c2c099024f 100644 --- a/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/aft/test/version_bump/data/repo_snapshot/packages/common/amplify_db_common_dart/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: 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" + sqlite3: ">=2.0.0 <2.7.0" dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" diff --git a/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml b/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml index 392888e035..37dc8c834a 100644 --- a/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml +++ b/packages/aft/test/version_bump/data/repo_snapshot/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: oauth2: ^2.0.2 package_info_plus: ^8.0.0 pigeon: ^11.0.0 - sqlite3: ">=2.0.0 <2.4.3" + sqlite3: ">=2.0.0 <2.7.0" source_gen: ^1.3.2 stack_trace: ^1.10.0 uuid: ">=3.0.6 <5.0.0" diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart index 43354d9825..402f21dc1b 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '0.4.6'; +const packageVersion = '0.4.7'; diff --git a/packages/common/amplify_db_common/example/lib/db.g.dart b/packages/common/amplify_db_common/example/lib/db.g.dart index ec5b9a35d1..8e89323eef 100644 --- a/packages/common/amplify_db_common/example/lib/db.g.dart +++ b/packages/common/amplify_db_common/example/lib/db.g.dart @@ -106,6 +106,13 @@ class CountTableData extends DataClass implements Insertable { id: id ?? this.id, count: count ?? this.count, ); + CountTableData copyWithCompanion(CountTableCompanion data) { + return CountTableData( + id: data.id.present ? data.id.value : this.id, + count: data.count.present ? data.count.value : this.count, + ); + } + @override String toString() { return (StringBuffer('CountTableData(') @@ -177,6 +184,7 @@ class CountTableCompanion extends UpdateCompanion { abstract class _$AppDb extends GeneratedDatabase { _$AppDb(QueryExecutor e) : super(e); + $AppDbManager get managers => $AppDbManager(this); late final $CountTableTable countTable = $CountTableTable(this); @override Iterable> get allTables => @@ -184,3 +192,125 @@ abstract class _$AppDb extends GeneratedDatabase { @override List get allSchemaEntities => [countTable]; } + +typedef $$CountTableTableCreateCompanionBuilder = CountTableCompanion Function({ + Value id, + required int count, +}); +typedef $$CountTableTableUpdateCompanionBuilder = CountTableCompanion Function({ + Value id, + Value count, +}); + +class $$CountTableTableFilterComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnFilters(column)); + + ColumnFilters get count => $composableBuilder( + column: $table.count, builder: (column) => ColumnFilters(column)); +} + +class $$CountTableTableOrderingComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, builder: (column) => ColumnOrderings(column)); + + ColumnOrderings get count => $composableBuilder( + column: $table.count, builder: (column) => ColumnOrderings(column)); +} + +class $$CountTableTableAnnotationComposer + extends Composer<_$AppDb, $CountTableTable> { + $$CountTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get count => + $composableBuilder(column: $table.count, builder: (column) => column); +} + +class $$CountTableTableTableManager extends RootTableManager< + _$AppDb, + $CountTableTable, + CountTableData, + $$CountTableTableFilterComposer, + $$CountTableTableOrderingComposer, + $$CountTableTableAnnotationComposer, + $$CountTableTableCreateCompanionBuilder, + $$CountTableTableUpdateCompanionBuilder, + (CountTableData, BaseReferences<_$AppDb, $CountTableTable, CountTableData>), + CountTableData, + PrefetchHooks Function()> { + $$CountTableTableTableManager(_$AppDb db, $CountTableTable table) + : super(TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$CountTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$CountTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$CountTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: ({ + Value id = const Value.absent(), + Value count = const Value.absent(), + }) => + CountTableCompanion( + id: id, + count: count, + ), + createCompanionCallback: ({ + Value id = const Value.absent(), + required int count, + }) => + CountTableCompanion.insert( + id: id, + count: count, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + )); +} + +typedef $$CountTableTableProcessedTableManager = ProcessedTableManager< + _$AppDb, + $CountTableTable, + CountTableData, + $$CountTableTableFilterComposer, + $$CountTableTableOrderingComposer, + $$CountTableTableAnnotationComposer, + $$CountTableTableCreateCompanionBuilder, + $$CountTableTableUpdateCompanionBuilder, + (CountTableData, BaseReferences<_$AppDb, $CountTableTable, CountTableData>), + CountTableData, + PrefetchHooks Function()>; + +class $AppDbManager { + final _$AppDb _db; + $AppDbManager(this._db); + $$CountTableTableTableManager get countTable => + $$CountTableTableTableManager(_db, _db.countTable); +} diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml index 7e4a737502..0a77a594e0 100644 --- a/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: drift: ^2.25.0 meta: ^1.7.0 path: ">=1.8.0 <2.0.0" - sqlite3: ">=2.0.0 <2.4.7" + sqlite3: ">=2.0.0 <2.7.0" dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..1839e89896 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,6 +8,7 @@ import Foundation import amplify_auth_cognito import amplify_secure_storage import device_info_plus +import file_picker import package_info_plus import path_provider_foundation import url_launcher_macos @@ -16,6 +17,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) + FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) 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 index babd86c0c1..68115be6de 100644 --- 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 @@ -1,10 +1,10 @@ // dart format width=80 // ignore_for_file: type=lint -import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.dart' - as i2; +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:drift/drift.dart' as i0; +import 'package:amplify_storage_s3_dart/src/storage_s3_service/transfer/database/tables.dart' + as i2; typedef $$TransferRecordsTableCreateCompanionBuilder = i1.TransferRecordsCompanion Function({ @@ -12,6 +12,8 @@ typedef $$TransferRecordsTableCreateCompanionBuilder required String uploadId, required String objectKey, required String createdAt, + i0.Value bucketName, + i0.Value awsRegion, }); typedef $$TransferRecordsTableUpdateCompanionBuilder = i1.TransferRecordsCompanion Function({ @@ -19,6 +21,8 @@ typedef $$TransferRecordsTableUpdateCompanionBuilder i0.Value uploadId, i0.Value objectKey, i0.Value createdAt, + i0.Value bucketName, + i0.Value awsRegion, }); class $$TransferRecordsTableFilterComposer @@ -41,6 +45,12 @@ class $$TransferRecordsTableFilterComposer i0.ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get bucketName => $composableBuilder( + column: $table.bucketName, builder: (column) => i0.ColumnFilters(column)); + + i0.ColumnFilters get awsRegion => $composableBuilder( + column: $table.awsRegion, builder: (column) => i0.ColumnFilters(column)); } class $$TransferRecordsTableOrderingComposer @@ -65,6 +75,14 @@ class $$TransferRecordsTableOrderingComposer i0.ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get bucketName => $composableBuilder( + column: $table.bucketName, + builder: (column) => i0.ColumnOrderings(column)); + + i0.ColumnOrderings get awsRegion => $composableBuilder( + column: $table.awsRegion, + builder: (column) => i0.ColumnOrderings(column)); } class $$TransferRecordsTableAnnotationComposer @@ -87,6 +105,12 @@ class $$TransferRecordsTableAnnotationComposer i0.GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); + + i0.GeneratedColumn get bucketName => $composableBuilder( + column: $table.bucketName, builder: (column) => column); + + i0.GeneratedColumn get awsRegion => + $composableBuilder(column: $table.awsRegion, builder: (column) => column); } class $$TransferRecordsTableTableManager extends i0.RootTableManager< @@ -121,24 +145,32 @@ class $$TransferRecordsTableTableManager extends i0.RootTableManager< i0.Value uploadId = const i0.Value.absent(), i0.Value objectKey = const i0.Value.absent(), i0.Value createdAt = const i0.Value.absent(), + i0.Value bucketName = const i0.Value.absent(), + i0.Value awsRegion = const i0.Value.absent(), }) => i1.TransferRecordsCompanion( id: id, uploadId: uploadId, objectKey: objectKey, createdAt: createdAt, + bucketName: bucketName, + awsRegion: awsRegion, ), createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String uploadId, required String objectKey, required String createdAt, + i0.Value bucketName = const i0.Value.absent(), + i0.Value awsRegion = const i0.Value.absent(), }) => i1.TransferRecordsCompanion.insert( id: id, uploadId: uploadId, objectKey: objectKey, createdAt: createdAt, + bucketName: bucketName, + awsRegion: awsRegion, ), withReferenceMapper: (p0) => p0 .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e))) @@ -378,6 +410,8 @@ class TransferRecord extends i0.DataClass uploadId: uploadId ?? this.uploadId, objectKey: objectKey ?? this.objectKey, createdAt: createdAt ?? this.createdAt, + bucketName: bucketName.present ? bucketName.value : this.bucketName, + awsRegion: awsRegion.present ? awsRegion.value : this.awsRegion, ); TransferRecord copyWithCompanion(i1.TransferRecordsCompanion data) { return TransferRecord( @@ -385,6 +419,9 @@ class TransferRecord extends i0.DataClass uploadId: data.uploadId.present ? data.uploadId.value : this.uploadId, objectKey: data.objectKey.present ? data.objectKey.value : this.objectKey, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, + bucketName: + data.bucketName.present ? data.bucketName.value : this.bucketName, + awsRegion: data.awsRegion.present ? data.awsRegion.value : this.awsRegion, ); } diff --git a/pubspec.yaml b/pubspec.yaml index c6e5bad781..98abe24e59 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: oauth2: ^2.0.2 package_info_plus: ^8.0.0 pigeon: ^22.6.2 - sqlite3: ">=2.0.0 <2.4.7" + sqlite3: ">=2.6.0 <2.7.0" source_gen: ^1.3.2 stack_trace: ^1.10.0 uuid: ">=3.0.6 <5.0.0"