Re-run build

drift/lib/src/runtime/devtools/shared.g.dart

@@ -1,77 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'shared.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-TypeDescription _$TypeDescriptionFromJson(Map<String, dynamic> json) =>
-    TypeDescription(
-      type: $enumDecodeNullable(_$DriftSqlTypeEnumMap, json['type']),
-      customTypeName: json['customTypeName'] as String?,
-    );
-
-Map<String, dynamic> _$TypeDescriptionToJson(TypeDescription instance) =>
-    <String, dynamic>{
-      'type': _$DriftSqlTypeEnumMap[instance.type],
-      'customTypeName': instance.customTypeName,
-    };
-
-const _$DriftSqlTypeEnumMap = {
-  DriftSqlType.bool: 'bool',
-  DriftSqlType.string: 'string',
-  DriftSqlType.bigInt: 'bigInt',
-  DriftSqlType.int: 'int',
-  DriftSqlType.dateTime: 'dateTime',
-  DriftSqlType.blob: 'blob',
-  DriftSqlType.double: 'double',
-  DriftSqlType.any: 'any',
-};
-
-ColumnDescription _$ColumnDescriptionFromJson(Map<String, dynamic> json) =>
-    ColumnDescription(
-      name: json['name'] as String,
-      type: json['type'] == null
-          ? null
-          : TypeDescription.fromJson(json['type'] as Map<String, dynamic>),
-      isNullable: json['isNullable'] as bool,
-    );
-
-Map<String, dynamic> _$ColumnDescriptionToJson(ColumnDescription instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-      'type': instance.type,
-      'isNullable': instance.isNullable,
-    };
-
-EntityDescription _$EntityDescriptionFromJson(Map<String, dynamic> json) =>
-    EntityDescription(
-      name: json['name'] as String,
-      type: json['type'] as String,
-      columns: (json['columns'] as List<dynamic>?)
-          ?.map((e) => ColumnDescription.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$EntityDescriptionToJson(EntityDescription instance) =>
-    <String, dynamic>{
-      'name': instance.name,
-      'type': instance.type,
-      'columns': instance.columns,
-    };
-
-DatabaseDescription _$DatabaseDescriptionFromJson(Map<String, dynamic> json) =>
-    DatabaseDescription(
-      dateTimeAsText: json['dateTimeAsText'] as bool,
-      entities: (json['entities'] as List<dynamic>)
-          .map((e) => EntityDescription.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$DatabaseDescriptionToJson(
-        DatabaseDescription instance) =>
-    <String, dynamic>{
-      'dateTimeAsText': instance.dateTimeAsText,
-      'entities': instance.entities,
-    };

drift/test/test_utils/test_utils.mocks.dart

@@ -64,6 +64,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   set isInTransaction(bool? _isInTransaction) => super.noSuchMethod(
         Invocation.setter(
@@ -72,6 +73,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i2.DbVersionDelegate get versionDelegate => (super.noSuchMethod(
         Invocation.getter(#versionDelegate),
@@ -84,6 +86,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
           Invocation.getter(#versionDelegate),
         ),
       ) as _i2.DbVersionDelegate);
+
   @override
   _i2.TransactionDelegate get transactionDelegate => (super.noSuchMethod(
         Invocation.getter(#transactionDelegate),
@@ -96,12 +99,14 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
           Invocation.getter(#transactionDelegate),
         ),
       ) as _i2.TransactionDelegate);
+
   @override
   _i4.FutureOr<bool> get isOpen => (super.noSuchMethod(
         Invocation.getter(#isOpen),
         returnValue: _i4.Future<bool>.value(false),
         returnValueForMissingStub: _i4.Future<bool>.value(false),
       ) as _i4.FutureOr<bool>);
+
   @override
   _i4.Future<void> open(_i5.QueryExecutorUser? db) => (super.noSuchMethod(
         Invocation.method(
@@ -111,6 +116,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: _i4.Future<void>.value(),
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
+
   @override
   _i4.Future<void> close() => (super.noSuchMethod(
         Invocation.method(
@@ -120,6 +126,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: _i4.Future<void>.value(),
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
+
   @override
   void notifyDatabaseOpened(_i5.OpeningDetails? details) => super.noSuchMethod(
         Invocation.method(
@@ -128,6 +135,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i4.Future<_i3.QueryResult> runSelect(
     String? statement,
@@ -163,6 +171,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
           ),
         )),
       ) as _i4.Future<_i3.QueryResult>);
+
   @override
   _i4.Future<int> runUpdate(
     String? statement,
@@ -179,6 +188,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: _i4.Future<int>.value(0),
         returnValueForMissingStub: _i4.Future<int>.value(0),
       ) as _i4.Future<int>);
+
   @override
   _i4.Future<int> runInsert(
     String? statement,
@@ -195,6 +205,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: _i4.Future<int>.value(0),
         returnValueForMissingStub: _i4.Future<int>.value(0),
       ) as _i4.Future<int>);
+
   @override
   _i4.Future<void> runCustom(
     String? statement,
@@ -211,6 +222,7 @@ class MockDatabaseDelegate extends _i1.Mock implements _i2.DatabaseDelegate {
         returnValue: _i4.Future<void>.value(),
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
+
   @override
   _i4.Future<void> runBatched(_i5.BatchedStatements? statements) =>
       (super.noSuchMethod(
@@ -234,6 +246,7 @@ class MockDynamicVersionDelegate extends _i1.Mock
         returnValue: _i4.Future<int>.value(0),
         returnValueForMissingStub: _i4.Future<int>.value(0),
       ) as _i4.Future<int>);
+
   @override
   _i4.Future<void> setSchemaVersion(int? version) => (super.noSuchMethod(
         Invocation.method(
@@ -256,6 +269,7 @@ class MockSupportedTransactionDelegate extends _i1.Mock
         returnValue: false,
         returnValueForMissingStub: false,
       ) as bool);
+
   @override
   _i4.FutureOr<void> startTransaction(
           _i4.Future<dynamic> Function(_i2.QueryDelegate)? run) =>
@@ -284,6 +298,7 @@ class MockStreamQueries extends _i1.Mock implements _i6.StreamQueryStore {
         returnValueForMissingStub:
             _i4.Stream<List<Map<String, Object?>>>.empty(),
       ) as _i4.Stream<List<Map<String, Object?>>>);
+
   @override
   _i4.Stream<Set<_i5.TableUpdate>> updatesForSync(
           _i5.TableUpdateQuery? query) =>
@@ -295,6 +310,7 @@ class MockStreamQueries extends _i1.Mock implements _i6.StreamQueryStore {
         returnValue: _i4.Stream<Set<_i5.TableUpdate>>.empty(),
         returnValueForMissingStub: _i4.Stream<Set<_i5.TableUpdate>>.empty(),
       ) as _i4.Stream<Set<_i5.TableUpdate>>);
+
   @override
   void handleTableUpdates(Set<_i5.TableUpdate>? updates) => super.noSuchMethod(
         Invocation.method(
@@ -303,6 +319,7 @@ class MockStreamQueries extends _i1.Mock implements _i6.StreamQueryStore {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void markAsClosed(
     _i6.QueryStream? stream,
@@ -318,6 +335,7 @@ class MockStreamQueries extends _i1.Mock implements _i6.StreamQueryStore {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   void markAsOpened(_i6.QueryStream? stream) => super.noSuchMethod(
         Invocation.method(
@@ -326,6 +344,7 @@ class MockStreamQueries extends _i1.Mock implements _i6.StreamQueryStore {
         ),
         returnValueForMissingStub: null,
       );
+
   @override
   _i4.Future<void> close() => (super.noSuchMethod(
         Invocation.method(

examples/app/lib/database/database.g.dart

@@ -32,9 +32,10 @@ class $CategoriesTable extends Categories
   @override
   List<GeneratedColumn> get $columns => [id, name, color];
   @override
-  String get aliasedName => _alias ?? 'categories';
+  String get aliasedName => _alias ?? actualTableName;
   @override
-  String get actualTableName => 'categories';
+  String get actualTableName => $name;
+  static const String $name = 'categories';
   @override
   VerificationContext validateIntegrity(Insertable<Category> instance,
       {bool isInserting = false}) {
@@ -194,6 +195,7 @@ class CategoriesCompanion extends UpdateCompanion<Category> {
     }
     if (color.present) {
       final converter = $CategoriesTable.$convertercolor;
+
       map['color'] = Variable<int>(converter.toSql(color.value));
     }
     return map;
@@ -249,9 +251,10 @@ class $TodoEntriesTable extends TodoEntries
   @override
   List<GeneratedColumn> get $columns => [id, description, category, dueDate];
   @override
-  String get aliasedName => _alias ?? 'todo_entries';
+  String get aliasedName => _alias ?? actualTableName;
   @override
-  String get actualTableName => 'todo_entries';
+  String get actualTableName => $name;
+  static const String $name = 'todo_entries';
   @override
   VerificationContext validateIntegrity(Insertable<TodoEntry> instance,
       {bool isInserting = false}) {
@@ -486,9 +489,10 @@ class TextEntries extends Table
   @override
   List<GeneratedColumn> get $columns => [description];
   @override
-  String get aliasedName => _alias ?? 'text_entries';
+  String get aliasedName => _alias ?? actualTableName;
   @override
-  String get actualTableName => 'text_entries';
+  String get actualTableName => $name;
+  static const String $name = 'text_entries';
   @override
   VerificationContext validateIntegrity(Insertable<TextEntrie> instance,
       {bool isInserting = false}) {

examples/encryption/lib/database.g.dart

@@ -26,9 +26,10 @@ class $NotesTable extends Notes with TableInfo<$NotesTable, Note> {
   @override
   List<GeneratedColumn> get $columns => [id, content];
   @override
-  String get aliasedName => _alias ?? 'notes';
+  String get aliasedName => _alias ?? actualTableName;
   @override
-  String get actualTableName => 'notes';
+  String get actualTableName => $name;
+  static const String $name = 'notes';
   @override
   VerificationContext validateIntegrity(Insertable<Note> instance,
       {bool isInserting = false}) {

examples/modular/lib/src/users.drift.dart

@@ -292,6 +292,7 @@ class UsersCompanion extends i0.UpdateCompanion<i1.User> {
     }
     if (preferences.present) {
       final converter = i1.Users.$converterpreferencesn;
+
       map['preferences'] =
           i0.Variable<String>(converter.toSql(preferences.value));
     }

extras/integration_tests/drift_testcases/lib/database/database.g.dart

@@ -295,6 +295,7 @@ class UsersCompanion extends UpdateCompanion<User> {
     }
     if (preferences.present) {
       final converter = $UsersTable.$converterpreferences;
+
       map['preferences'] = Variable<String>(converter.toSql(preferences.value));
     }
     return map;