diff --git a/drift/example/main.g.dart b/drift/example/main.g.dart
index 193359d1..54180e66 100644
--- a/drift/example/main.g.dart
+++ b/drift/example/main.g.dart
@@ -172,6 +172,8 @@ class $TodoCategoriesTable extends TodoCategories
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   TodoCategory map(Map<String, dynamic> data, {String? tablePrefix}) {
     return TodoCategory.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -460,6 +462,8 @@ class $TodoItemsTable extends TodoItems
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   TodoItem map(Map<String, dynamic> data, {String? tablePrefix}) {
     return TodoItem.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/drift/test/data/tables/custom_tables.g.dart b/drift/test/data/tables/custom_tables.g.dart
index 204a4cc9..7d3c326b 100644
--- a/drift/test/data/tables/custom_tables.g.dart
+++ b/drift/test/data/tables/custom_tables.g.dart
@@ -271,6 +271,8 @@ class ConfigTable extends Table with TableInfo<ConfigTable, Config> {
   @override
   Set<GeneratedColumn> get $primaryKey => {configKey};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Config map(Map<String, dynamic> data, {String? tablePrefix}) {
     return Config.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -458,6 +460,8 @@ class WithDefaults extends Table with TableInfo<WithDefaults, WithDefault> {
   @override
   Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   WithDefault map(Map<String, dynamic> data, {String? tablePrefix}) {
     return WithDefault.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -546,6 +550,8 @@ class NoIds extends Table with TableInfo<NoIds, NoIdRow> {
   @override
   Set<GeneratedColumn> get $primaryKey => {payload};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   NoIdRow map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return NoIdRow(
@@ -767,6 +773,8 @@ class WithConstraints extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   WithConstraint map(Map<String, dynamic> data, {String? tablePrefix}) {
     return WithConstraint.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -1036,6 +1044,8 @@ class Mytable extends Table with TableInfo<Mytable, MytableData> {
   @override
   Set<GeneratedColumn> get $primaryKey => {someid};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   MytableData map(Map<String, dynamic> data, {String? tablePrefix}) {
     return MytableData.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -1256,6 +1266,8 @@ class Email extends Table
   @override
   Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   EMail map(Map<String, dynamic> data, {String? tablePrefix}) {
     return EMail.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -1443,6 +1455,8 @@ class WeirdTable extends Table with TableInfo<WeirdTable, WeirdData> {
   @override
   Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   WeirdData map(Map<String, dynamic> data, {String? tablePrefix}) {
     return WeirdData.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/benchmarks/lib/src/moor/database.g.dart b/extras/benchmarks/lib/src/moor/database.g.dart
index e6788d89..a52e95e2 100644
--- a/extras/benchmarks/lib/src/moor/database.g.dart
+++ b/extras/benchmarks/lib/src/moor/database.g.dart
@@ -126,9 +126,10 @@ class KeyValuesCompanion extends UpdateCompanion<KeyValue> {
 
 class $KeyValuesTable extends KeyValues
     with TableInfo<$KeyValuesTable, KeyValue> {
-  final GeneratedDatabase _db;
+  @override
+  final GeneratedDatabase attachedDatabase;
   final String? _alias;
-  $KeyValuesTable(this._db, [this._alias]);
+  $KeyValuesTable(this.attachedDatabase, [this._alias]);
   final VerificationMeta _keyMeta = const VerificationMeta('key');
   @override
   late final GeneratedColumn<String?> key = GeneratedColumn<String?>(
@@ -168,6 +169,8 @@ class $KeyValuesTable extends KeyValues
   @override
   Set<GeneratedColumn> get $primaryKey => {key};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   KeyValue map(Map<String, dynamic> data, {String? tablePrefix}) {
     return KeyValue.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -175,7 +178,7 @@ class $KeyValuesTable extends KeyValues
 
   @override
   $KeyValuesTable createAlias(String alias) {
-    return $KeyValuesTable(_db, alias);
+    return $KeyValuesTable(attachedDatabase, alias);
   }
 }
 
diff --git a/extras/flutter_web_worker_example/lib/src/database/database.g.dart b/extras/flutter_web_worker_example/lib/src/database/database.g.dart
index 0ffea14b..714d5d17 100644
--- a/extras/flutter_web_worker_example/lib/src/database/database.g.dart
+++ b/extras/flutter_web_worker_example/lib/src/database/database.g.dart
@@ -166,6 +166,8 @@ class Entries extends Table with TableInfo<Entries, Entrie> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Entrie map(Map<String, dynamic> data, {String? tablePrefix}) {
     return Entrie.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/integration_tests/tests/lib/database/database.g.dart b/extras/integration_tests/tests/lib/database/database.g.dart
index 6f8d402f..b6ea609f 100644
--- a/extras/integration_tests/tests/lib/database/database.g.dart
+++ b/extras/integration_tests/tests/lib/database/database.g.dart
@@ -307,6 +307,8 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   User map(Map<String, dynamic> data, {String? tablePrefix}) {
     return User.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -531,6 +533,8 @@ class $FriendshipsTable extends Friendships
   @override
   Set<GeneratedColumn> get $primaryKey => {firstUser, secondUser};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Friendship map(Map<String, dynamic> data, {String? tablePrefix}) {
     return Friendship.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/integration_tests/web/test/saves_after_migration_regression_test.g.dart b/extras/integration_tests/web/test/saves_after_migration_regression_test.g.dart
index d59031d7..6700f642 100644
--- a/extras/integration_tests/web/test/saves_after_migration_regression_test.g.dart
+++ b/extras/integration_tests/web/test/saves_after_migration_regression_test.g.dart
@@ -137,6 +137,8 @@ class $FoosTable extends Foos with TableInfo<$FoosTable, Foo> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Foo map(Map<String, dynamic> data, {String tablePrefix}) {
     return Foo.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -278,6 +280,8 @@ class $BarsTable extends Bars with TableInfo<$BarsTable, Bar> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Bar map(Map<String, dynamic> data, {String tablePrefix}) {
     return Bar.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/migrations_example/lib/database.g.dart b/extras/migrations_example/lib/database.g.dart
index 5ebecf3b..064aad3d 100644
--- a/extras/migrations_example/lib/database.g.dart
+++ b/extras/migrations_example/lib/database.g.dart
@@ -166,6 +166,8 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   User map(Map<String, dynamic> data, {String? tablePrefix}) {
     return User.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
@@ -414,6 +416,8 @@ class Groups extends Table with TableInfo<Groups, Group> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Group map(Map<String, dynamic> data, {String? tablePrefix}) {
     return Group.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/web_worker_example/lib/database.g.dart b/extras/web_worker_example/lib/database.g.dart
index 9c2d2e59..84fd46af 100644
--- a/extras/web_worker_example/lib/database.g.dart
+++ b/extras/web_worker_example/lib/database.g.dart
@@ -166,6 +166,8 @@ class Entries extends Table with TableInfo<Entries, Entrie> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   Entrie map(Map<String, dynamic> data, {String? tablePrefix}) {
     return Entrie.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);
diff --git a/extras/with_built_value/lib/database.drift.dart b/extras/with_built_value/lib/database.drift.dart
index 780c1133..5c09e81d 100644
--- a/extras/with_built_value/lib/database.drift.dart
+++ b/extras/with_built_value/lib/database.drift.dart
@@ -171,6 +171,8 @@ class Users extends Table with TableInfo<Users, User> {
   @override
   Set<GeneratedColumn> get $primaryKey => {id};
   @override
+  List<Set<GeneratedColumn>> get uniqueKeys => [];
+  @override
   User map(Map<String, dynamic> data, {String tablePrefix}) {
     return User.fromData(data,
         prefix: tablePrefix != null ? '$tablePrefix.' : null);