Refactor Insertables to avoid covariant parameters

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

@@ -52,6 +52,28 @@ class User extends DataClass implements Insertable<User> {
           .mapFromDatabaseResponse(data['${effectivePrefix}preferences'])),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || name != null) {
+      map['name'] = Variable<String>(name);
+    }
+    if (!nullToAbsent || birthDate != null) {
+      map['birth_date'] = Variable<DateTime>(birthDate);
+    }
+    if (!nullToAbsent || profilePicture != null) {
+      map['profile_picture'] = Variable<Uint8List>(profilePicture);
+    }
+    if (!nullToAbsent || preferences != null) {
+      final converter = $UsersTable.$converter0;
+      map['preferences'] = Variable<String>(converter.mapToSql(preferences));
+    }
+    return map;
+  }
+
   factory User.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -75,23 +97,6 @@ class User extends DataClass implements Insertable<User> {
     };
   }
 
-  @override
-  UsersCompanion createCompanion(bool nullToAbsent) {
-    return UsersCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      name: name == null && nullToAbsent ? const Value.absent() : Value(name),
-      birthDate: birthDate == null && nullToAbsent
-          ? const Value.absent()
-          : Value(birthDate),
-      profilePicture: profilePicture == null && nullToAbsent
-          ? const Value.absent()
-          : Value(profilePicture),
-      preferences: preferences == null && nullToAbsent
-          ? const Value.absent()
-          : Value(preferences),
-    );
-  }
-
   User copyWith(
           {int id,
           String name,
@@ -170,6 +175,29 @@ class UsersCompanion extends UpdateCompanion<User> {
       preferences: preferences ?? this.preferences,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (birthDate.present) {
+      map['birth_date'] = Variable<DateTime>(birthDate.value);
+    }
+    if (profilePicture.present) {
+      map['profile_picture'] = Variable<Uint8List>(profilePicture.value);
+    }
+    if (preferences.present) {
+      final converter = $UsersTable.$converter0;
+      map['preferences'] =
+          Variable<String>(converter.mapToSql(preferences.value));
+    }
+    return map;
+  }
 }
 
 class $UsersTable extends Users with TableInfo<$UsersTable, User> {
@@ -247,29 +275,30 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
   @override
   final String actualTableName = 'users';
   @override
-  VerificationContext validateIntegrity(UsersCompanion d,
+  VerificationContext validateIntegrity(Insertable<User> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.name.present) {
+    if (data.containsKey('name')) {
       context.handle(
-          _nameMeta, name.isAcceptableValue(d.name.value, _nameMeta));
+          _nameMeta, name.isAcceptableOrUnknown(data['name'], _nameMeta));
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
-    if (d.birthDate.present) {
+    if (data.containsKey('birth_date')) {
       context.handle(_birthDateMeta,
-          birthDate.isAcceptableValue(d.birthDate.value, _birthDateMeta));
+          birthDate.isAcceptableOrUnknown(data['birth_date'], _birthDateMeta));
     } else if (isInserting) {
       context.missing(_birthDateMeta);
     }
-    if (d.profilePicture.present) {
+    if (data.containsKey('profile_picture')) {
       context.handle(
           _profilePictureMeta,
-          profilePicture.isAcceptableValue(
+          profilePicture.isAcceptableOrUnknown(
-              d.profilePicture.value, _profilePictureMeta));
+              data['profile_picture'], _profilePictureMeta));
     }
     context.handle(_preferencesMeta, const VerificationResult.success());
     return context;
@@ -283,29 +312,6 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
     return User.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(UsersCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.name.present) {
-      map['name'] = Variable<String>(d.name.value);
-    }
-    if (d.birthDate.present) {
-      map['birth_date'] = Variable<DateTime>(d.birthDate.value);
-    }
-    if (d.profilePicture.present) {
-      map['profile_picture'] = Variable<Uint8List>(d.profilePicture.value);
-    }
-    if (d.preferences.present) {
-      final converter = $UsersTable.$converter0;
-      map['preferences'] =
-          Variable<String>(converter.mapToSql(d.preferences.value));
-    }
-    return map;
-  }
-
   @override
   $UsersTable createAlias(String alias) {
     return $UsersTable(_db, alias);
@@ -337,6 +343,21 @@ class Friendship extends DataClass implements Insertable<Friendship> {
           data['${effectivePrefix}really_good_friends']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || firstUser != null) {
+      map['first_user'] = Variable<int>(firstUser);
+    }
+    if (!nullToAbsent || secondUser != null) {
+      map['second_user'] = Variable<int>(secondUser);
+    }
+    if (!nullToAbsent || reallyGoodFriends != null) {
+      map['really_good_friends'] = Variable<bool>(reallyGoodFriends);
+    }
+    return map;
+  }
+
   factory Friendship.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -356,21 +377,6 @@ class Friendship extends DataClass implements Insertable<Friendship> {
     };
   }
 
-  @override
-  FriendshipsCompanion createCompanion(bool nullToAbsent) {
-    return FriendshipsCompanion(
-      firstUser: firstUser == null && nullToAbsent
-          ? const Value.absent()
-          : Value(firstUser),
-      secondUser: secondUser == null && nullToAbsent
-          ? const Value.absent()
-          : Value(secondUser),
-      reallyGoodFriends: reallyGoodFriends == null && nullToAbsent
-          ? const Value.absent()
-          : Value(reallyGoodFriends),
-    );
-  }
-
   Friendship copyWith(
           {int firstUser, int secondUser, bool reallyGoodFriends}) =>
       Friendship(
@@ -425,6 +431,21 @@ class FriendshipsCompanion extends UpdateCompanion<Friendship> {
       reallyGoodFriends: reallyGoodFriends ?? this.reallyGoodFriends,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (firstUser.present) {
+      map['first_user'] = Variable<int>(firstUser.value);
+    }
+    if (secondUser.present) {
+      map['second_user'] = Variable<int>(secondUser.value);
+    }
+    if (reallyGoodFriends.present) {
+      map['really_good_friends'] = Variable<bool>(reallyGoodFriends.value);
+    }
+    return map;
+  }
 }
 
 class $FriendshipsTable extends Friendships
@@ -477,26 +498,29 @@ class $FriendshipsTable extends Friendships
   @override
   final String actualTableName = 'friendships';
   @override
-  VerificationContext validateIntegrity(FriendshipsCompanion d,
+  VerificationContext validateIntegrity(Insertable<Friendship> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.firstUser.present) {
+    final data = instance.toColumns(true);
+    if (data.containsKey('first_user')) {
       context.handle(_firstUserMeta,
-          firstUser.isAcceptableValue(d.firstUser.value, _firstUserMeta));
+          firstUser.isAcceptableOrUnknown(data['first_user'], _firstUserMeta));
     } else if (isInserting) {
       context.missing(_firstUserMeta);
     }
-    if (d.secondUser.present) {
+    if (data.containsKey('second_user')) {
-      context.handle(_secondUserMeta,
+      context.handle(
-          secondUser.isAcceptableValue(d.secondUser.value, _secondUserMeta));
+          _secondUserMeta,
+          secondUser.isAcceptableOrUnknown(
+              data['second_user'], _secondUserMeta));
     } else if (isInserting) {
       context.missing(_secondUserMeta);
     }
-    if (d.reallyGoodFriends.present) {
+    if (data.containsKey('really_good_friends')) {
       context.handle(
           _reallyGoodFriendsMeta,
-          reallyGoodFriends.isAcceptableValue(
+          reallyGoodFriends.isAcceptableOrUnknown(
-              d.reallyGoodFriends.value, _reallyGoodFriendsMeta));
+              data['really_good_friends'], _reallyGoodFriendsMeta));
     }
     return context;
   }
@@ -509,21 +533,6 @@ class $FriendshipsTable extends Friendships
     return Friendship.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(FriendshipsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.firstUser.present) {
-      map['first_user'] = Variable<int>(d.firstUser.value);
-    }
-    if (d.secondUser.present) {
-      map['second_user'] = Variable<int>(d.secondUser.value);
-    }
-    if (d.reallyGoodFriends.present) {
-      map['really_good_friends'] = Variable<bool>(d.reallyGoodFriends.value);
-    }
-    return map;
-  }
-
   @override
   $FriendshipsTable createAlias(String alias) {
     return $FriendshipsTable(_db, alias);

extras/with_built_value/lib/database.moor.dart

@@ -21,6 +21,18 @@ class User extends DataClass implements Insertable<User> {
       name: stringType.mapFromDatabaseResponse(data['${effectivePrefix}name']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || name != null) {
+      map['name'] = Variable<String>(name);
+    }
+    return map;
+  }
+
   factory User.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -38,14 +50,6 @@ class User extends DataClass implements Insertable<User> {
     };
   }
 
-  @override
-  UsersCompanion createCompanion(bool nullToAbsent) {
-    return UsersCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      name: name == null && nullToAbsent ? const Value.absent() : Value(name),
-    );
-  }
-
   User copyWith({int id, String name}) => User(
         id: id ?? this.id,
         name: name ?? this.name,
@@ -84,6 +88,18 @@ class UsersCompanion extends UpdateCompanion<User> {
       name: name ?? this.name,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    return map;
+  }
 }
 
 class Users extends Table with TableInfo<Users, User> {
@@ -117,15 +133,16 @@ class Users extends Table with TableInfo<Users, User> {
   @override
   final String actualTableName = 'users';
   @override
-  VerificationContext validateIntegrity(UsersCompanion d,
+  VerificationContext validateIntegrity(Insertable<User> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.name.present) {
+    if (data.containsKey('name')) {
       context.handle(
-          _nameMeta, name.isAcceptableValue(d.name.value, _nameMeta));
+          _nameMeta, name.isAcceptableOrUnknown(data['name'], _nameMeta));
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
@@ -140,18 +157,6 @@ class Users extends Table with TableInfo<Users, User> {
     return User.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(UsersCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.name.present) {
-      map['name'] = Variable<String>(d.name.value);
-    }
-    return map;
-  }
-
   @override
   Users createAlias(String alias) {
     return Users(_db, alias);

moor/CHANGELOG.md

@@ -16,6 +16,10 @@
   method now returns an `Selectable` (like `customSelectQuery`, which in turn has been deprecated).
 - __Breaking__: Columns that are aliases to sqlite's `rowid` column are now longer considered required
   for inserts
+- __Breaking__: Changes the way data classes and companions are inserted:
+  - Removed `Insertable.toCompanion`
+  - Added `Insertable.toColumns` to obtain a map from column names to values that should be inserted
+  - Removed `TableInfo.entityToSql` - use `Insertable.toColumns` instead
 - Experimentally support IndexedDB to store sqlite data on the web
 - Moor will no longer wait for query stream listeners to receive a done event when closing a database
   or transaction.

moor/example/example.g.dart

@@ -22,6 +22,18 @@ class Category extends DataClass implements Insertable<Category> {
           .mapFromDatabaseResponse(data['${effectivePrefix}description']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || description != null) {
+      map['description'] = Variable<String>(description);
+    }
+    return map;
+  }
+
   factory Category.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -44,16 +56,6 @@ class Category extends DataClass implements Insertable<Category> {
     };
   }
 
-  @override
-  CategoriesCompanion createCompanion(bool nullToAbsent) {
-    return CategoriesCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      description: description == null && nullToAbsent
-          ? const Value.absent()
-          : Value(description),
-    );
-  }
-
   Category copyWith({int id, String description}) => Category(
         id: id ?? this.id,
         description: description ?? this.description,
@@ -94,6 +96,18 @@ class CategoriesCompanion extends UpdateCompanion<Category> {
       description: description ?? this.description,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (description.present) {
+      map['description'] = Variable<String>(description.value);
+    }
+    return map;
+  }
 }
 
 class $CategoriesTable extends Categories
@@ -133,15 +147,18 @@ class $CategoriesTable extends Categories
   @override
   final String actualTableName = 'categories';
   @override
-  VerificationContext validateIntegrity(CategoriesCompanion d,
+  VerificationContext validateIntegrity(Insertable<Category> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.description.present) {
+    if (data.containsKey('description')) {
-      context.handle(_descriptionMeta,
+      context.handle(
-          description.isAcceptableValue(d.description.value, _descriptionMeta));
+          _descriptionMeta,
+          description.isAcceptableOrUnknown(
+              data['description'], _descriptionMeta));
     }
     return context;
   }
@@ -154,18 +171,6 @@ class $CategoriesTable extends Categories
     return Category.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(CategoriesCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.description.present) {
-      map['description'] = Variable<String>(d.description.value);
-    }
-    return map;
-  }
-
   @override
   $CategoriesTable createAlias(String alias) {
     return $CategoriesTable(_db, alias);
@@ -197,6 +202,24 @@ class Recipe extends DataClass implements Insertable<Recipe> {
           intType.mapFromDatabaseResponse(data['${effectivePrefix}category']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || title != null) {
+      map['title'] = Variable<String>(title);
+    }
+    if (!nullToAbsent || instructions != null) {
+      map['instructions'] = Variable<String>(instructions);
+    }
+    if (!nullToAbsent || category != null) {
+      map['category'] = Variable<int>(category);
+    }
+    return map;
+  }
+
   factory Recipe.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -222,21 +245,6 @@ class Recipe extends DataClass implements Insertable<Recipe> {
     };
   }
 
-  @override
-  RecipesCompanion createCompanion(bool nullToAbsent) {
-    return RecipesCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      title:
-          title == null && nullToAbsent ? const Value.absent() : Value(title),
-      instructions: instructions == null && nullToAbsent
-          ? const Value.absent()
-          : Value(instructions),
-      category: category == null && nullToAbsent
-          ? const Value.absent()
-          : Value(category),
-    );
-  }
-
   Recipe copyWith({int id, String title, String instructions, int category}) =>
       Recipe(
         id: id ?? this.id,
@@ -298,6 +306,24 @@ class RecipesCompanion extends UpdateCompanion<Recipe> {
       category: category ?? this.category,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (title.present) {
+      map['title'] = Variable<String>(title.value);
+    }
+    if (instructions.present) {
+      map['instructions'] = Variable<String>(instructions.value);
+    }
+    if (category.present) {
+      map['category'] = Variable<int>(category.value);
+    }
+    return map;
+  }
 }
 
 class $RecipesTable extends Recipes with TableInfo<$RecipesTable, Recipe> {
@@ -356,29 +382,30 @@ class $RecipesTable extends Recipes with TableInfo<$RecipesTable, Recipe> {
   @override
   final String actualTableName = 'recipes';
   @override
-  VerificationContext validateIntegrity(RecipesCompanion d,
+  VerificationContext validateIntegrity(Insertable<Recipe> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.title.present) {
+    if (data.containsKey('title')) {
       context.handle(
-          _titleMeta, title.isAcceptableValue(d.title.value, _titleMeta));
+          _titleMeta, title.isAcceptableOrUnknown(data['title'], _titleMeta));
     } else if (isInserting) {
       context.missing(_titleMeta);
     }
-    if (d.instructions.present) {
+    if (data.containsKey('instructions')) {
       context.handle(
           _instructionsMeta,
-          instructions.isAcceptableValue(
+          instructions.isAcceptableOrUnknown(
-              d.instructions.value, _instructionsMeta));
+              data['instructions'], _instructionsMeta));
     } else if (isInserting) {
       context.missing(_instructionsMeta);
     }
-    if (d.category.present) {
+    if (data.containsKey('category')) {
       context.handle(_categoryMeta,
-          category.isAcceptableValue(d.category.value, _categoryMeta));
+          category.isAcceptableOrUnknown(data['category'], _categoryMeta));
     }
     return context;
   }
@@ -391,24 +418,6 @@ class $RecipesTable extends Recipes with TableInfo<$RecipesTable, Recipe> {
     return Recipe.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(RecipesCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.title.present) {
-      map['title'] = Variable<String>(d.title.value);
-    }
-    if (d.instructions.present) {
-      map['instructions'] = Variable<String>(d.instructions.value);
-    }
-    if (d.category.present) {
-      map['category'] = Variable<int>(d.category.value);
-    }
-    return map;
-  }
-
   @override
   $RecipesTable createAlias(String alias) {
     return $RecipesTable(_db, alias);
@@ -433,6 +442,21 @@ class Ingredient extends DataClass implements Insertable<Ingredient> {
           intType.mapFromDatabaseResponse(data['${effectivePrefix}calories']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || name != null) {
+      map['name'] = Variable<String>(name);
+    }
+    if (!nullToAbsent || caloriesPer100g != null) {
+      map['calories'] = Variable<int>(caloriesPer100g);
+    }
+    return map;
+  }
+
   factory Ingredient.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -457,17 +481,6 @@ class Ingredient extends DataClass implements Insertable<Ingredient> {
     };
   }
 
-  @override
-  IngredientsCompanion createCompanion(bool nullToAbsent) {
-    return IngredientsCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      name: name == null && nullToAbsent ? const Value.absent() : Value(name),
-      caloriesPer100g: caloriesPer100g == null && nullToAbsent
-          ? const Value.absent()
-          : Value(caloriesPer100g),
-    );
-  }
-
   Ingredient copyWith({int id, String name, int caloriesPer100g}) => Ingredient(
         id: id ?? this.id,
         name: name ?? this.name,
@@ -518,6 +531,21 @@ class IngredientsCompanion extends UpdateCompanion<Ingredient> {
       caloriesPer100g: caloriesPer100g ?? this.caloriesPer100g,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (caloriesPer100g.present) {
+      map['calories'] = Variable<int>(caloriesPer100g.value);
+    }
+    return map;
+  }
 }
 
 class $IngredientsTable extends Ingredients
@@ -569,23 +597,24 @@ class $IngredientsTable extends Ingredients
   @override
   final String actualTableName = 'ingredients';
   @override
-  VerificationContext validateIntegrity(IngredientsCompanion d,
+  VerificationContext validateIntegrity(Insertable<Ingredient> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.name.present) {
+    if (data.containsKey('name')) {
       context.handle(
-          _nameMeta, name.isAcceptableValue(d.name.value, _nameMeta));
+          _nameMeta, name.isAcceptableOrUnknown(data['name'], _nameMeta));
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
-    if (d.caloriesPer100g.present) {
+    if (data.containsKey('calories')) {
       context.handle(
           _caloriesPer100gMeta,
-          caloriesPer100g.isAcceptableValue(
+          caloriesPer100g.isAcceptableOrUnknown(
-              d.caloriesPer100g.value, _caloriesPer100gMeta));
+              data['calories'], _caloriesPer100gMeta));
     } else if (isInserting) {
       context.missing(_caloriesPer100gMeta);
     }
@@ -600,21 +629,6 @@ class $IngredientsTable extends Ingredients
     return Ingredient.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(IngredientsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.name.present) {
-      map['name'] = Variable<String>(d.name.value);
-    }
-    if (d.caloriesPer100g.present) {
-      map['calories'] = Variable<int>(d.caloriesPer100g.value);
-    }
-    return map;
-  }
-
   @override
   $IngredientsTable createAlias(String alias) {
     return $IngredientsTable(_db, alias);
@@ -643,6 +657,21 @@ class IngredientInRecipe extends DataClass
           intType.mapFromDatabaseResponse(data['${effectivePrefix}amount']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || recipe != null) {
+      map['recipe'] = Variable<int>(recipe);
+    }
+    if (!nullToAbsent || ingredient != null) {
+      map['ingredient'] = Variable<int>(ingredient);
+    }
+    if (!nullToAbsent || amountInGrams != null) {
+      map['amount'] = Variable<int>(amountInGrams);
+    }
+    return map;
+  }
+
   factory IngredientInRecipe.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -667,20 +696,6 @@ class IngredientInRecipe extends DataClass
     };
   }
 
-  @override
-  IngredientInRecipesCompanion createCompanion(bool nullToAbsent) {
-    return IngredientInRecipesCompanion(
-      recipe:
-          recipe == null && nullToAbsent ? const Value.absent() : Value(recipe),
-      ingredient: ingredient == null && nullToAbsent
-          ? const Value.absent()
-          : Value(ingredient),
-      amountInGrams: amountInGrams == null && nullToAbsent
-          ? const Value.absent()
-          : Value(amountInGrams),
-    );
-  }
-
   IngredientInRecipe copyWith(
           {int recipe, int ingredient, int amountInGrams}) =>
       IngredientInRecipe(
@@ -734,6 +749,21 @@ class IngredientInRecipesCompanion extends UpdateCompanion<IngredientInRecipe> {
       amountInGrams: amountInGrams ?? this.amountInGrams,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (recipe.present) {
+      map['recipe'] = Variable<int>(recipe.value);
+    }
+    if (ingredient.present) {
+      map['ingredient'] = Variable<int>(ingredient.value);
+    }
+    if (amountInGrams.present) {
+      map['amount'] = Variable<int>(amountInGrams.value);
+    }
+    return map;
+  }
 }
 
 class $IngredientInRecipesTable extends IngredientInRecipes
@@ -788,26 +818,29 @@ class $IngredientInRecipesTable extends IngredientInRecipes
   @override
   final String actualTableName = 'recipe_ingredients';
   @override
-  VerificationContext validateIntegrity(IngredientInRecipesCompanion d,
+  VerificationContext validateIntegrity(Insertable<IngredientInRecipe> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.recipe.present) {
+    final data = instance.toColumns(true);
-      context.handle(
+    if (data.containsKey('recipe')) {
-          _recipeMeta, recipe.isAcceptableValue(d.recipe.value, _recipeMeta));
+      context.handle(_recipeMeta,
+          recipe.isAcceptableOrUnknown(data['recipe'], _recipeMeta));
     } else if (isInserting) {
       context.missing(_recipeMeta);
     }
-    if (d.ingredient.present) {
+    if (data.containsKey('ingredient')) {
-      context.handle(_ingredientMeta,
+      context.handle(
-          ingredient.isAcceptableValue(d.ingredient.value, _ingredientMeta));
+          _ingredientMeta,
+          ingredient.isAcceptableOrUnknown(
+              data['ingredient'], _ingredientMeta));
     } else if (isInserting) {
       context.missing(_ingredientMeta);
     }
-    if (d.amountInGrams.present) {
+    if (data.containsKey('amount')) {
       context.handle(
           _amountInGramsMeta,
-          amountInGrams.isAcceptableValue(
+          amountInGrams.isAcceptableOrUnknown(
-              d.amountInGrams.value, _amountInGramsMeta));
+              data['amount'], _amountInGramsMeta));
     } else if (isInserting) {
       context.missing(_amountInGramsMeta);
     }
@@ -822,21 +855,6 @@ class $IngredientInRecipesTable extends IngredientInRecipes
     return IngredientInRecipe.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(IngredientInRecipesCompanion d) {
-    final map = <String, Variable>{};
-    if (d.recipe.present) {
-      map['recipe'] = Variable<int>(d.recipe.value);
-    }
-    if (d.ingredient.present) {
-      map['ingredient'] = Variable<int>(d.ingredient.value);
-    }
-    if (d.amountInGrams.present) {
-      map['amount'] = Variable<int>(d.amountInGrams.value);
-    }
-    return map;
-  }
-
   @override
   $IngredientInRecipesTable createAlias(String alias) {
     return $IngredientInRecipesTable(_db, alias);

moor/lib/src/runtime/data_class.dart

@@ -8,12 +8,17 @@ import 'package:moor/moor.dart';
 /// [D] is the associated data class.
 @optionalTypeArgs
 abstract class Insertable<D extends DataClass> {
-  /// Converts this object into a companion that can be used for inserts. On
+  /// Converts this object into a map of column names to expressions to insert
-  /// data classes, [nullToAbsent] will map `null` fields to [Value.absent()].
+  /// or update.
-  /// Otherwise, null fields will be mapped to `Value(null)`.
   ///
-  /// Mainly used internally by moor.
+  /// Note that the keys in the map are the raw column names, they're not
-  UpdateCompanion<D> createCompanion(bool nullToAbsent);
+  /// escaped.
+  ///
+  /// The [nullToAbsent] can be used on [DataClass]es to control whether null
+  /// fields should be set to a null constant in sql or absent from the map.
+  /// Other implementations ignore that [nullToAbsent], it mainly exists for
+  /// legacy reasons.
+  Map<String, Expression> toColumns(bool nullToAbsent);
 }
 
 /// A common supertype for all data classes generated by moor. Data classes are
@@ -54,11 +59,6 @@ abstract class DataClass {
 abstract class UpdateCompanion<D extends DataClass> implements Insertable<D> {
   /// Constant constructor so that generated companion classes can be constant.
   const UpdateCompanion();
-
-  @override
-  UpdateCompanion<D> createCompanion(bool nullToAbsent) {
-    return this;
-  }
 }
 
 /// A wrapper around arbitrary data [T] to indicate presence or absence

moor/lib/src/runtime/data_verification.dart

@@ -43,8 +43,8 @@ class VerificationContext {
   /// check results. Used by generated code.
   VerificationContext() : _errors = {};
 
-  /// Constructs a verification context that can't be used to report error. This
+  /// Constructs a verification context that can't be used to report errors.
-  /// is used internally by moor if integrity checks have been disabled.
+  /// This is used internally by moor if integrity checks have been disabled.
   const VerificationContext.notEnabled() : _errors = const {};
 
   /// Used internally by moor when inserting

moor/lib/src/runtime/query_builder/schema/columns.dart

@@ -104,6 +104,20 @@ abstract class GeneratedColumn<T> extends Column<T> {
     }
   }
 
+  /// A more general version of [isAcceptableValue] that supports any sql
+  /// expression.
+  ///
+  /// The default implementation will not perform any check if [value] is not
+  /// a [Variable].
+  VerificationResult isAcceptableOrUnknown(
+      Expression value, VerificationMeta meta) {
+    if (value is Variable) {
+      return isAcceptableValue(value.value as T, meta);
+    } else {
+      return const VerificationResult.success();
+    }
+  }
+
   /// Returns true if this column needs to be set when writing a new row into
   /// a table.
   bool get isRequired {

moor/lib/src/runtime/query_builder/schema/table_info.dart

@@ -46,20 +46,13 @@ mixin TableInfo<TableDsl extends Table, D extends DataClass> on Table
 
   /// Validates that the given entity can be inserted into this table, meaning
   /// that it respects all constraints (nullability, text length, etc.).
-  VerificationContext validateIntegrity(covariant UpdateCompanion<D> instance,
+  VerificationContext validateIntegrity(Insertable<D> instance,
       {bool isInserting = false}) {
     // default behavior when users chose to not verify the integrity (build time
     // option)
     return const VerificationContext.notEnabled();
   }
 
-  /// Maps the given update companion to a [Map] that can be inserted into sql.
-  /// The keys should represent the column name in sql, the values the
-  /// corresponding values of the field. All fields of the [instance] which are
-  /// present will be written, absent fields will be omitted.
-  /// Note that column names aren't escaped in the [Map.keys].
-  Map<String, Variable> entityToSql(covariant UpdateCompanion<D> instance);
-
   /// Maps the given row returned by the database into the fitting data class.
   D map(Map<String, dynamic> data, {String tablePrefix});
 
@@ -67,8 +60,17 @@ mixin TableInfo<TableDsl extends Table, D extends DataClass> on Table
   ///
   /// Values that are [Value.absent] in the companion will be set to `null`.
   D mapFromCompanion(UpdateCompanion<D> companion) {
-    final rawValues =
+    final asColumnMap = companion.toColumns(false);
-        entityToSql(companion).map((key, value) => MapEntry(key, value.value));
+
+    if (asColumnMap.values.any((e) => e is! Variable)) {
+      throw ArgumentError('The companion $companion cannot be transformed '
+          'into a dataclass as it contains expressions that need to be '
+          'evaluated by a database engine.');
+    }
+
+    final rawValues = asColumnMap
+        .cast<String, Variable>()
+        .map((key, value) => MapEntry(key, value.value));
 
     return map(rawValues);
   }

moor/lib/src/runtime/query_builder/statements/insert.dart

@@ -49,10 +49,10 @@ class InsertStatement<D extends DataClass> {
   GenerationContext createContext(Insertable<D> entry, InsertMode mode) {
     _validateIntegrity(entry);
 
-    final rawValues = table.entityToSql(entry.createCompanion(true));
+    final rawValues = entry.toColumns(true);
 
     // apply default values for columns that have one
-    final map = <String, Variable>{};
+    final map = <String, Expression>{};
     for (final column in table.$columns) {
       final columnName = column.$name;
 
@@ -108,9 +108,7 @@ class InsertStatement<D extends DataClass> {
           'Cannot write null row into ${table.$tableName}');
     }
 
-    table
+    table.validateIntegrity(d, isInserting: true).throwIfInvalid(d);
-        .validateIntegrity(d.createCompanion(true), isInserting: true)
-        .throwIfInvalid(d);
   }
 }
 

moor/lib/src/runtime/query_builder/statements/query.dart

@@ -205,8 +205,8 @@ mixin SingleTableQueryMixin<T extends Table, D extends DataClass>
       return MapEntry(column.$name, column);
     }));
 
-    final updatedFields = table.entityToSql(d.createCompanion(false));
+    final updatedFields = d.toColumns(false);
-    // Construct a map of [GeneratedColumn] to [Variable] where each column is
+    // Construct a map of [GeneratedColumn] to [Expression] where each column is
     // a primary key and the associated value was extracted from d.
     final primaryKeyValues = Map.fromEntries(updatedFields.entries
             .where((entry) => primaryKeyColumns.containsKey(entry.key)))

moor/lib/src/runtime/query_builder/statements/update.dart

@@ -60,10 +60,9 @@ class UpdateStatement<T extends Table, D extends DataClass> extends Query<T, D>
   /// See also: [replace], which does not require [where] statements and
   /// supports setting fields back to null.
   Future<int> write(Insertable<D> entity, {bool dontExecute = false}) async {
-    final companion = entity.createCompanion(true);
+    table.validateIntegrity(entity).throwIfInvalid(entity);
-    table.validateIntegrity(companion).throwIfInvalid(entity);
 
-    _updatedFields = table.entityToSql(companion)
+    _updatedFields = entity.toColumns(true)
       ..remove((_, value) => value == null);
 
     if (_updatedFields.isEmpty) {
@@ -100,10 +99,8 @@ class UpdateStatement<T extends Table, D extends DataClass> extends Query<T, D>
   Future<bool> replace(Insertable<D> entity, {bool dontExecute = false}) async {
     // We don't turn nulls to absent values here (as opposed to a regular
     // update, where only non-null fields will be written).
-    final companion = entity.createCompanion(false);
+    final columns = entity.toColumns(false);
-    table
+    table.validateIntegrity(entity, isInserting: true).throwIfInvalid(entity);
-        .validateIntegrity(companion, isInserting: true)
-        .throwIfInvalid(entity);
     assert(
         whereExpr == null,
         'When using replace on an update statement, you may not use where(...)'
@@ -114,8 +111,9 @@ class UpdateStatement<T extends Table, D extends DataClass> extends Query<T, D>
     // copying to work around type issues - Map<String, Variable> extends
     // Map<String, Expression> but crashes when adding anything that is not
     // a Variable.
-    _updatedFields = <String, Expression>{}
+    _updatedFields = columns is Map<String, Variable>
-      ..addAll(table.entityToSql(companion));
+        ? Map<String, Expression>.of(columns)
+        : columns;
 
     final primaryKeys = table.$primaryKey.map((c) => c.$name);
 

moor/test/data/tables/custom_tables.g.dart

@@ -26,6 +26,22 @@ class Config extends DataClass implements Insertable<Config> {
           .mapFromDatabaseResponse(data['${effectivePrefix}sync_state'])),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || configKey != null) {
+      map['config_key'] = Variable<String>(configKey);
+    }
+    if (!nullToAbsent || configValue != null) {
+      map['config_value'] = Variable<String>(configValue);
+    }
+    if (!nullToAbsent || syncState != null) {
+      final converter = ConfigTable.$converter0;
+      map['sync_state'] = Variable<int>(converter.mapToSql(syncState));
+    }
+    return map;
+  }
+
   factory Config.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -49,21 +65,6 @@ class Config extends DataClass implements Insertable<Config> {
     };
   }
 
-  @override
-  ConfigCompanion createCompanion(bool nullToAbsent) {
-    return ConfigCompanion(
-      configKey: configKey == null && nullToAbsent
-          ? const Value.absent()
-          : Value(configKey),
-      configValue: configValue == null && nullToAbsent
-          ? const Value.absent()
-          : Value(configValue),
-      syncState: syncState == null && nullToAbsent
-          ? const Value.absent()
-          : Value(syncState),
-    );
-  }
-
   Config copyWith({String configKey, String configValue, SyncType syncState}) =>
       Config(
         configKey: configKey ?? this.configKey,
@@ -116,6 +117,22 @@ class ConfigCompanion extends UpdateCompanion<Config> {
       syncState: syncState ?? this.syncState,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (configKey.present) {
+      map['config_key'] = Variable<String>(configKey.value);
+    }
+    if (configValue.present) {
+      map['config_value'] = Variable<String>(configValue.value);
+    }
+    if (syncState.present) {
+      final converter = ConfigTable.$converter0;
+      map['sync_state'] = Variable<int>(converter.mapToSql(syncState.value));
+    }
+    return map;
+  }
 }
 
 class ConfigTable extends Table with TableInfo<ConfigTable, Config> {
@@ -157,18 +174,21 @@ class ConfigTable extends Table with TableInfo<ConfigTable, Config> {
   @override
   final String actualTableName = 'config';
   @override
-  VerificationContext validateIntegrity(ConfigCompanion d,
+  VerificationContext validateIntegrity(Insertable<Config> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.configKey.present) {
+    final data = instance.toColumns(true);
+    if (data.containsKey('config_key')) {
       context.handle(_configKeyMeta,
-          configKey.isAcceptableValue(d.configKey.value, _configKeyMeta));
+          configKey.isAcceptableOrUnknown(data['config_key'], _configKeyMeta));
     } else if (isInserting) {
       context.missing(_configKeyMeta);
     }
-    if (d.configValue.present) {
+    if (data.containsKey('config_value')) {
-      context.handle(_configValueMeta,
+      context.handle(
-          configValue.isAcceptableValue(d.configValue.value, _configValueMeta));
+          _configValueMeta,
+          configValue.isAcceptableOrUnknown(
+              data['config_value'], _configValueMeta));
     }
     context.handle(_syncStateMeta, const VerificationResult.success());
     return context;
@@ -182,22 +202,6 @@ class ConfigTable extends Table with TableInfo<ConfigTable, Config> {
     return Config.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(ConfigCompanion d) {
-    final map = <String, Variable>{};
-    if (d.configKey.present) {
-      map['config_key'] = Variable<String>(d.configKey.value);
-    }
-    if (d.configValue.present) {
-      map['config_value'] = Variable<String>(d.configValue.value);
-    }
-    if (d.syncState.present) {
-      final converter = ConfigTable.$converter0;
-      map['sync_state'] = Variable<int>(converter.mapToSql(d.syncState.value));
-    }
-    return map;
-  }
-
   @override
   ConfigTable createAlias(String alias) {
     return ConfigTable(_db, alias);
@@ -222,6 +226,18 @@ class WithDefault extends DataClass implements Insertable<WithDefault> {
       b: intType.mapFromDatabaseResponse(data['${effectivePrefix}b']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || a != null) {
+      map['a'] = Variable<String>(a);
+    }
+    if (!nullToAbsent || b != null) {
+      map['b'] = Variable<int>(b);
+    }
+    return map;
+  }
+
   factory WithDefault.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -244,14 +260,6 @@ class WithDefault extends DataClass implements Insertable<WithDefault> {
     };
   }
 
-  @override
-  WithDefaultsCompanion createCompanion(bool nullToAbsent) {
-    return WithDefaultsCompanion(
-      a: a == null && nullToAbsent ? const Value.absent() : Value(a),
-      b: b == null && nullToAbsent ? const Value.absent() : Value(b),
-    );
-  }
-
   WithDefault copyWith({String a, int b}) => WithDefault(
         a: a ?? this.a,
         b: b ?? this.b,
@@ -290,6 +298,18 @@ class WithDefaultsCompanion extends UpdateCompanion<WithDefault> {
       b: b ?? this.b,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (a.present) {
+      map['a'] = Variable<String>(a.value);
+    }
+    if (b.present) {
+      map['b'] = Variable<int>(b.value);
+    }
+    return map;
+  }
 }
 
 class WithDefaults extends Table with TableInfo<WithDefaults, WithDefault> {
@@ -322,14 +342,15 @@ class WithDefaults extends Table with TableInfo<WithDefaults, WithDefault> {
   @override
   final String actualTableName = 'with_defaults';
   @override
-  VerificationContext validateIntegrity(WithDefaultsCompanion d,
+  VerificationContext validateIntegrity(Insertable<WithDefault> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.a.present) {
+    final data = instance.toColumns(true);
-      context.handle(_aMeta, a.isAcceptableValue(d.a.value, _aMeta));
+    if (data.containsKey('a')) {
+      context.handle(_aMeta, a.isAcceptableOrUnknown(data['a'], _aMeta));
     }
-    if (d.b.present) {
+    if (data.containsKey('b')) {
-      context.handle(_bMeta, b.isAcceptableValue(d.b.value, _bMeta));
+      context.handle(_bMeta, b.isAcceptableOrUnknown(data['b'], _bMeta));
     }
     return context;
   }
@@ -342,18 +363,6 @@ class WithDefaults extends Table with TableInfo<WithDefaults, WithDefault> {
     return WithDefault.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(WithDefaultsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.a.present) {
-      map['a'] = Variable<String>(d.a.value);
-    }
-    if (d.b.present) {
-      map['b'] = Variable<int>(d.b.value);
-    }
-    return map;
-  }
-
   @override
   WithDefaults createAlias(String alias) {
     return WithDefaults(_db, alias);
@@ -375,6 +384,15 @@ class NoId extends DataClass implements Insertable<NoId> {
           .mapFromDatabaseResponse(data['${effectivePrefix}payload']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || payload != null) {
+      map['payload'] = Variable<Uint8List>(payload);
+    }
+    return map;
+  }
+
   factory NoId.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -394,15 +412,6 @@ class NoId extends DataClass implements Insertable<NoId> {
     };
   }
 
-  @override
-  NoIdsCompanion createCompanion(bool nullToAbsent) {
-    return NoIdsCompanion(
-      payload: payload == null && nullToAbsent
-          ? const Value.absent()
-          : Value(payload),
-    );
-  }
-
   NoId copyWith({Uint8List payload}) => NoId(
         payload: payload ?? this.payload,
       );
@@ -433,6 +442,15 @@ class NoIdsCompanion extends UpdateCompanion<NoId> {
       payload: payload ?? this.payload,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (payload.present) {
+      map['payload'] = Variable<Uint8List>(payload.value);
+    }
+    return map;
+  }
 }
 
 class NoIds extends Table with TableInfo<NoIds, NoId> {
@@ -456,12 +474,13 @@ class NoIds extends Table with TableInfo<NoIds, NoId> {
   @override
   final String actualTableName = 'no_ids';
   @override
-  VerificationContext validateIntegrity(NoIdsCompanion d,
+  VerificationContext validateIntegrity(Insertable<NoId> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.payload.present) {
+    final data = instance.toColumns(true);
+    if (data.containsKey('payload')) {
       context.handle(_payloadMeta,
-          payload.isAcceptableValue(d.payload.value, _payloadMeta));
+          payload.isAcceptableOrUnknown(data['payload'], _payloadMeta));
     } else if (isInserting) {
       context.missing(_payloadMeta);
     }
@@ -476,15 +495,6 @@ class NoIds extends Table with TableInfo<NoIds, NoId> {
     return NoId.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(NoIdsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.payload.present) {
-      map['payload'] = Variable<Uint8List>(d.payload.value);
-    }
-    return map;
-  }
-
   @override
   NoIds createAlias(String alias) {
     return NoIds(_db, alias);
@@ -514,6 +524,21 @@ class WithConstraint extends DataClass implements Insertable<WithConstraint> {
       c: doubleType.mapFromDatabaseResponse(data['${effectivePrefix}c']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || a != null) {
+      map['a'] = Variable<String>(a);
+    }
+    if (!nullToAbsent || b != null) {
+      map['b'] = Variable<int>(b);
+    }
+    if (!nullToAbsent || c != null) {
+      map['c'] = Variable<double>(c);
+    }
+    return map;
+  }
+
   factory WithConstraint.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -538,15 +563,6 @@ class WithConstraint extends DataClass implements Insertable<WithConstraint> {
     };
   }
 
-  @override
-  WithConstraintsCompanion createCompanion(bool nullToAbsent) {
-    return WithConstraintsCompanion(
-      a: a == null && nullToAbsent ? const Value.absent() : Value(a),
-      b: b == null && nullToAbsent ? const Value.absent() : Value(b),
-      c: c == null && nullToAbsent ? const Value.absent() : Value(c),
-    );
-  }
-
   WithConstraint copyWith({String a, int b, double c}) => WithConstraint(
         a: a ?? this.a,
         b: b ?? this.b,
@@ -595,6 +611,21 @@ class WithConstraintsCompanion extends UpdateCompanion<WithConstraint> {
       c: c ?? this.c,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (a.present) {
+      map['a'] = Variable<String>(a.value);
+    }
+    if (b.present) {
+      map['b'] = Variable<int>(b.value);
+    }
+    if (c.present) {
+      map['c'] = Variable<double>(c.value);
+    }
+    return map;
+  }
 }
 
 class WithConstraints extends Table
@@ -633,19 +664,20 @@ class WithConstraints extends Table
   @override
   final String actualTableName = 'with_constraints';
   @override
-  VerificationContext validateIntegrity(WithConstraintsCompanion d,
+  VerificationContext validateIntegrity(Insertable<WithConstraint> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.a.present) {
+    final data = instance.toColumns(true);
-      context.handle(_aMeta, a.isAcceptableValue(d.a.value, _aMeta));
+    if (data.containsKey('a')) {
+      context.handle(_aMeta, a.isAcceptableOrUnknown(data['a'], _aMeta));
     }
-    if (d.b.present) {
+    if (data.containsKey('b')) {
-      context.handle(_bMeta, b.isAcceptableValue(d.b.value, _bMeta));
+      context.handle(_bMeta, b.isAcceptableOrUnknown(data['b'], _bMeta));
     } else if (isInserting) {
       context.missing(_bMeta);
     }
-    if (d.c.present) {
+    if (data.containsKey('c')) {
-      context.handle(_cMeta, c.isAcceptableValue(d.c.value, _cMeta));
+      context.handle(_cMeta, c.isAcceptableOrUnknown(data['c'], _cMeta));
     }
     return context;
   }
@@ -658,21 +690,6 @@ class WithConstraints extends Table
     return WithConstraint.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(WithConstraintsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.a.present) {
-      map['a'] = Variable<String>(d.a.value);
-    }
-    if (d.b.present) {
-      map['b'] = Variable<int>(d.b.value);
-    }
-    if (d.c.present) {
-      map['c'] = Variable<double>(d.c.value);
-    }
-    return map;
-  }
-
   @override
   WithConstraints createAlias(String alias) {
     return WithConstraints(_db, alias);
@@ -709,6 +726,24 @@ class MytableData extends DataClass implements Insertable<MytableData> {
           .mapFromDatabaseResponse(data['${effectivePrefix}somedate']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || someid != null) {
+      map['someid'] = Variable<int>(someid);
+    }
+    if (!nullToAbsent || sometext != null) {
+      map['sometext'] = Variable<String>(sometext);
+    }
+    if (!nullToAbsent || somebool != null) {
+      map['somebool'] = Variable<bool>(somebool);
+    }
+    if (!nullToAbsent || somedate != null) {
+      map['somedate'] = Variable<DateTime>(somedate);
+    }
+    return map;
+  }
+
   factory MytableData.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -735,23 +770,6 @@ class MytableData extends DataClass implements Insertable<MytableData> {
     };
   }
 
-  @override
-  MytableCompanion createCompanion(bool nullToAbsent) {
-    return MytableCompanion(
-      someid:
-          someid == null && nullToAbsent ? const Value.absent() : Value(someid),
-      sometext: sometext == null && nullToAbsent
-          ? const Value.absent()
-          : Value(sometext),
-      somebool: somebool == null && nullToAbsent
-          ? const Value.absent()
-          : Value(somebool),
-      somedate: somedate == null && nullToAbsent
-          ? const Value.absent()
-          : Value(somedate),
-    );
-  }
-
   MytableData copyWith(
           {int someid, String sometext, bool somebool, DateTime somedate}) =>
       MytableData(
@@ -813,6 +831,24 @@ class MytableCompanion extends UpdateCompanion<MytableData> {
       somedate: somedate ?? this.somedate,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (someid.present) {
+      map['someid'] = Variable<int>(someid.value);
+    }
+    if (sometext.present) {
+      map['sometext'] = Variable<String>(sometext.value);
+    }
+    if (somebool.present) {
+      map['somebool'] = Variable<bool>(somebool.value);
+    }
+    if (somedate.present) {
+      map['somedate'] = Variable<DateTime>(somedate.value);
+    }
+    return map;
+  }
 }
 
 class Mytable extends Table with TableInfo<Mytable, MytableData> {
@@ -860,24 +896,25 @@ class Mytable extends Table with TableInfo<Mytable, MytableData> {
   @override
   final String actualTableName = 'mytable';
   @override
-  VerificationContext validateIntegrity(MytableCompanion d,
+  VerificationContext validateIntegrity(Insertable<MytableData> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.someid.present) {
+    final data = instance.toColumns(true);
-      context.handle(
+    if (data.containsKey('someid')) {
-          _someidMeta, someid.isAcceptableValue(d.someid.value, _someidMeta));
+      context.handle(_someidMeta,
+          someid.isAcceptableOrUnknown(data['someid'], _someidMeta));
     }
-    if (d.sometext.present) {
+    if (data.containsKey('sometext')) {
       context.handle(_sometextMeta,
-          sometext.isAcceptableValue(d.sometext.value, _sometextMeta));
+          sometext.isAcceptableOrUnknown(data['sometext'], _sometextMeta));
     }
-    if (d.somebool.present) {
+    if (data.containsKey('somebool')) {
       context.handle(_someboolMeta,
-          somebool.isAcceptableValue(d.somebool.value, _someboolMeta));
+          somebool.isAcceptableOrUnknown(data['somebool'], _someboolMeta));
     }
-    if (d.somedate.present) {
+    if (data.containsKey('somedate')) {
       context.handle(_somedateMeta,
-          somedate.isAcceptableValue(d.somedate.value, _somedateMeta));
+          somedate.isAcceptableOrUnknown(data['somedate'], _somedateMeta));
     }
     return context;
   }
@@ -890,24 +927,6 @@ class Mytable extends Table with TableInfo<Mytable, MytableData> {
     return MytableData.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(MytableCompanion d) {
-    final map = <String, Variable>{};
-    if (d.someid.present) {
-      map['someid'] = Variable<int>(d.someid.value);
-    }
-    if (d.sometext.present) {
-      map['sometext'] = Variable<String>(d.sometext.value);
-    }
-    if (d.somebool.present) {
-      map['somebool'] = Variable<bool>(d.somebool.value);
-    }
-    if (d.somedate.present) {
-      map['somedate'] = Variable<DateTime>(d.somedate.value);
-    }
-    return map;
-  }
-
   @override
   Mytable createAlias(String alias) {
     return Mytable(_db, alias);
@@ -934,6 +953,21 @@ class EMail extends DataClass implements Insertable<EMail> {
       body: stringType.mapFromDatabaseResponse(data['${effectivePrefix}body']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || sender != null) {
+      map['sender'] = Variable<String>(sender);
+    }
+    if (!nullToAbsent || title != null) {
+      map['title'] = Variable<String>(title);
+    }
+    if (!nullToAbsent || body != null) {
+      map['body'] = Variable<String>(body);
+    }
+    return map;
+  }
+
   factory EMail.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -957,17 +991,6 @@ class EMail extends DataClass implements Insertable<EMail> {
     };
   }
 
-  @override
-  EmailCompanion createCompanion(bool nullToAbsent) {
-    return EmailCompanion(
-      sender:
-          sender == null && nullToAbsent ? const Value.absent() : Value(sender),
-      title:
-          title == null && nullToAbsent ? const Value.absent() : Value(title),
-      body: body == null && nullToAbsent ? const Value.absent() : Value(body),
-    );
-  }
-
   EMail copyWith({String sender, String title, String body}) => EMail(
         sender: sender ?? this.sender,
         title: title ?? this.title,
@@ -1019,6 +1042,21 @@ class EmailCompanion extends UpdateCompanion<EMail> {
       body: body ?? this.body,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (sender.present) {
+      map['sender'] = Variable<String>(sender.value);
+    }
+    if (title.present) {
+      map['title'] = Variable<String>(title.value);
+    }
+    if (body.present) {
+      map['body'] = Variable<String>(body.value);
+    }
+    return map;
+  }
 }
 
 class Email extends Table
@@ -1059,24 +1097,25 @@ class Email extends Table
   @override
   final String actualTableName = 'email';
   @override
-  VerificationContext validateIntegrity(EmailCompanion d,
+  VerificationContext validateIntegrity(Insertable<EMail> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.sender.present) {
+    final data = instance.toColumns(true);
-      context.handle(
+    if (data.containsKey('sender')) {
-          _senderMeta, sender.isAcceptableValue(d.sender.value, _senderMeta));
+      context.handle(_senderMeta,
+          sender.isAcceptableOrUnknown(data['sender'], _senderMeta));
     } else if (isInserting) {
       context.missing(_senderMeta);
     }
-    if (d.title.present) {
+    if (data.containsKey('title')) {
       context.handle(
-          _titleMeta, title.isAcceptableValue(d.title.value, _titleMeta));
+          _titleMeta, title.isAcceptableOrUnknown(data['title'], _titleMeta));
     } else if (isInserting) {
       context.missing(_titleMeta);
     }
-    if (d.body.present) {
+    if (data.containsKey('body')) {
       context.handle(
-          _bodyMeta, body.isAcceptableValue(d.body.value, _bodyMeta));
+          _bodyMeta, body.isAcceptableOrUnknown(data['body'], _bodyMeta));
     } else if (isInserting) {
       context.missing(_bodyMeta);
     }
@@ -1091,21 +1130,6 @@ class Email extends Table
     return EMail.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(EmailCompanion d) {
-    final map = <String, Variable>{};
-    if (d.sender.present) {
-      map['sender'] = Variable<String>(d.sender.value);
-    }
-    if (d.title.present) {
-      map['title'] = Variable<String>(d.title.value);
-    }
-    if (d.body.present) {
-      map['body'] = Variable<String>(d.body.value);
-    }
-    return map;
-  }
-
   @override
   Email createAlias(String alias) {
     return Email(_db, alias);

moor/test/data/tables/todos.g.dart

@@ -37,6 +37,27 @@ class TodoEntry extends DataClass implements Insertable<TodoEntry> {
           intType.mapFromDatabaseResponse(data['${effectivePrefix}category']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || title != null) {
+      map['title'] = Variable<String>(title);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    if (!nullToAbsent || targetDate != null) {
+      map['target_date'] = Variable<DateTime>(targetDate);
+    }
+    if (!nullToAbsent || category != null) {
+      map['category'] = Variable<int>(category);
+    }
+    return map;
+  }
+
   factory TodoEntry.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -65,24 +86,6 @@ class TodoEntry extends DataClass implements Insertable<TodoEntry> {
     };
   }
 
-  @override
-  TodosTableCompanion createCompanion(bool nullToAbsent) {
-    return TodosTableCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      title:
-          title == null && nullToAbsent ? const Value.absent() : Value(title),
-      content: content == null && nullToAbsent
-          ? const Value.absent()
-          : Value(content),
-      targetDate: targetDate == null && nullToAbsent
-          ? const Value.absent()
-          : Value(targetDate),
-      category: category == null && nullToAbsent
-          ? const Value.absent()
-          : Value(category),
-    );
-  }
-
   TodoEntry copyWith(
           {int id,
           String title,
@@ -160,6 +163,27 @@ class TodosTableCompanion extends UpdateCompanion<TodoEntry> {
       category: category ?? this.category,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (title.present) {
+      map['title'] = Variable<String>(title.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (targetDate.present) {
+      map['target_date'] = Variable<DateTime>(targetDate.value);
+    }
+    if (category.present) {
+      map['category'] = Variable<int>(category.value);
+    }
+    return map;
+  }
 }
 
 class $TodosTableTable extends TodosTable
@@ -232,29 +256,32 @@ class $TodosTableTable extends TodosTable
   @override
   final String actualTableName = 'todos';
   @override
-  VerificationContext validateIntegrity(TodosTableCompanion d,
+  VerificationContext validateIntegrity(Insertable<TodoEntry> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.title.present) {
+    if (data.containsKey('title')) {
       context.handle(
-          _titleMeta, title.isAcceptableValue(d.title.value, _titleMeta));
+          _titleMeta, title.isAcceptableOrUnknown(data['title'], _titleMeta));
     }
-    if (d.content.present) {
+    if (data.containsKey('content')) {
       context.handle(_contentMeta,
-          content.isAcceptableValue(d.content.value, _contentMeta));
+          content.isAcceptableOrUnknown(data['content'], _contentMeta));
     } else if (isInserting) {
       context.missing(_contentMeta);
     }
-    if (d.targetDate.present) {
+    if (data.containsKey('target_date')) {
-      context.handle(_targetDateMeta,
+      context.handle(
-          targetDate.isAcceptableValue(d.targetDate.value, _targetDateMeta));
+          _targetDateMeta,
+          targetDate.isAcceptableOrUnknown(
+              data['target_date'], _targetDateMeta));
     }
-    if (d.category.present) {
+    if (data.containsKey('category')) {
       context.handle(_categoryMeta,
-          category.isAcceptableValue(d.category.value, _categoryMeta));
+          category.isAcceptableOrUnknown(data['category'], _categoryMeta));
     }
     return context;
   }
@@ -267,27 +294,6 @@ class $TodosTableTable extends TodosTable
     return TodoEntry.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(TodosTableCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.title.present) {
-      map['title'] = Variable<String>(d.title.value);
-    }
-    if (d.content.present) {
-      map['content'] = Variable<String>(d.content.value);
-    }
-    if (d.targetDate.present) {
-      map['target_date'] = Variable<DateTime>(d.targetDate.value);
-    }
-    if (d.category.present) {
-      map['category'] = Variable<int>(d.category.value);
-    }
-    return map;
-  }
-
   @override
   $TodosTableTable createAlias(String alias) {
     return $TodosTableTable(_db, alias);
@@ -309,6 +315,18 @@ class Category extends DataClass implements Insertable<Category> {
           stringType.mapFromDatabaseResponse(data['${effectivePrefix}desc']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || description != null) {
+      map['desc'] = Variable<String>(description);
+    }
+    return map;
+  }
+
   factory Category.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -331,16 +349,6 @@ class Category extends DataClass implements Insertable<Category> {
     };
   }
 
-  @override
-  CategoriesCompanion createCompanion(bool nullToAbsent) {
-    return CategoriesCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      description: description == null && nullToAbsent
-          ? const Value.absent()
-          : Value(description),
-    );
-  }
-
   Category copyWith({int id, String description}) => Category(
         id: id ?? this.id,
         description: description ?? this.description,
@@ -381,6 +389,18 @@ class CategoriesCompanion extends UpdateCompanion<Category> {
       description: description ?? this.description,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (description.present) {
+      map['desc'] = Variable<String>(description.value);
+    }
+    return map;
+  }
 }
 
 class $CategoriesTable extends Categories
@@ -417,15 +437,16 @@ class $CategoriesTable extends Categories
   @override
   final String actualTableName = 'categories';
   @override
-  VerificationContext validateIntegrity(CategoriesCompanion d,
+  VerificationContext validateIntegrity(Insertable<Category> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.description.present) {
+    if (data.containsKey('desc')) {
       context.handle(_descriptionMeta,
-          description.isAcceptableValue(d.description.value, _descriptionMeta));
+          description.isAcceptableOrUnknown(data['desc'], _descriptionMeta));
     } else if (isInserting) {
       context.missing(_descriptionMeta);
     }
@@ -440,18 +461,6 @@ class $CategoriesTable extends Categories
     return Category.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(CategoriesCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.description.present) {
-      map['desc'] = Variable<String>(d.description.value);
-    }
-    return map;
-  }
-
   @override
   $CategoriesTable createAlias(String alias) {
     return $CategoriesTable(_db, alias);
@@ -489,6 +498,27 @@ class User extends DataClass implements Insertable<User> {
           .mapFromDatabaseResponse(data['${effectivePrefix}creation_time']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || name != null) {
+      map['name'] = Variable<String>(name);
+    }
+    if (!nullToAbsent || isAwesome != null) {
+      map['is_awesome'] = Variable<bool>(isAwesome);
+    }
+    if (!nullToAbsent || profilePicture != null) {
+      map['profile_picture'] = Variable<Uint8List>(profilePicture);
+    }
+    if (!nullToAbsent || creationTime != null) {
+      map['creation_time'] = Variable<DateTime>(creationTime);
+    }
+    return map;
+  }
+
   factory User.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -516,23 +546,6 @@ class User extends DataClass implements Insertable<User> {
     };
   }
 
-  @override
-  UsersCompanion createCompanion(bool nullToAbsent) {
-    return UsersCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      name: name == null && nullToAbsent ? const Value.absent() : Value(name),
-      isAwesome: isAwesome == null && nullToAbsent
-          ? const Value.absent()
-          : Value(isAwesome),
-      profilePicture: profilePicture == null && nullToAbsent
-          ? const Value.absent()
-          : Value(profilePicture),
-      creationTime: creationTime == null && nullToAbsent
-          ? const Value.absent()
-          : Value(creationTime),
-    );
-  }
-
   User copyWith(
           {int id,
           String name,
@@ -611,6 +624,27 @@ class UsersCompanion extends UpdateCompanion<User> {
       creationTime: creationTime ?? this.creationTime,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (isAwesome.present) {
+      map['is_awesome'] = Variable<bool>(isAwesome.value);
+    }
+    if (profilePicture.present) {
+      map['profile_picture'] = Variable<Uint8List>(profilePicture.value);
+    }
+    if (creationTime.present) {
+      map['creation_time'] = Variable<DateTime>(creationTime.value);
+    }
+    return map;
+  }
 }
 
 class $UsersTable extends Users with TableInfo<$UsersTable, User> {
@@ -679,35 +713,36 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
   @override
   final String actualTableName = 'users';
   @override
-  VerificationContext validateIntegrity(UsersCompanion d,
+  VerificationContext validateIntegrity(Insertable<User> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.name.present) {
+    if (data.containsKey('name')) {
       context.handle(
-          _nameMeta, name.isAcceptableValue(d.name.value, _nameMeta));
+          _nameMeta, name.isAcceptableOrUnknown(data['name'], _nameMeta));
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
-    if (d.isAwesome.present) {
+    if (data.containsKey('is_awesome')) {
       context.handle(_isAwesomeMeta,
-          isAwesome.isAcceptableValue(d.isAwesome.value, _isAwesomeMeta));
+          isAwesome.isAcceptableOrUnknown(data['is_awesome'], _isAwesomeMeta));
     }
-    if (d.profilePicture.present) {
+    if (data.containsKey('profile_picture')) {
       context.handle(
           _profilePictureMeta,
-          profilePicture.isAcceptableValue(
+          profilePicture.isAcceptableOrUnknown(
-              d.profilePicture.value, _profilePictureMeta));
+              data['profile_picture'], _profilePictureMeta));
     } else if (isInserting) {
       context.missing(_profilePictureMeta);
     }
-    if (d.creationTime.present) {
+    if (data.containsKey('creation_time')) {
       context.handle(
           _creationTimeMeta,
-          creationTime.isAcceptableValue(
+          creationTime.isAcceptableOrUnknown(
-              d.creationTime.value, _creationTimeMeta));
+              data['creation_time'], _creationTimeMeta));
     }
     return context;
   }
@@ -720,27 +755,6 @@ class $UsersTable extends Users with TableInfo<$UsersTable, User> {
     return User.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(UsersCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.name.present) {
-      map['name'] = Variable<String>(d.name.value);
-    }
-    if (d.isAwesome.present) {
-      map['is_awesome'] = Variable<bool>(d.isAwesome.value);
-    }
-    if (d.profilePicture.present) {
-      map['profile_picture'] = Variable<Uint8List>(d.profilePicture.value);
-    }
-    if (d.creationTime.present) {
-      map['creation_time'] = Variable<DateTime>(d.creationTime.value);
-    }
-    return map;
-  }
-
   @override
   $UsersTable createAlias(String alias) {
     return $UsersTable(_db, alias);
@@ -760,6 +774,18 @@ class SharedTodo extends DataClass implements Insertable<SharedTodo> {
       user: intType.mapFromDatabaseResponse(data['${effectivePrefix}user']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || todo != null) {
+      map['todo'] = Variable<int>(todo);
+    }
+    if (!nullToAbsent || user != null) {
+      map['user'] = Variable<int>(user);
+    }
+    return map;
+  }
+
   factory SharedTodo.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -782,14 +808,6 @@ class SharedTodo extends DataClass implements Insertable<SharedTodo> {
     };
   }
 
-  @override
-  SharedTodosCompanion createCompanion(bool nullToAbsent) {
-    return SharedTodosCompanion(
-      todo: todo == null && nullToAbsent ? const Value.absent() : Value(todo),
-      user: user == null && nullToAbsent ? const Value.absent() : Value(user),
-    );
-  }
-
   SharedTodo copyWith({int todo, int user}) => SharedTodo(
         todo: todo ?? this.todo,
         user: user ?? this.user,
@@ -831,6 +849,18 @@ class SharedTodosCompanion extends UpdateCompanion<SharedTodo> {
       user: user ?? this.user,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (todo.present) {
+      map['todo'] = Variable<int>(todo.value);
+    }
+    if (user.present) {
+      map['user'] = Variable<int>(user.value);
+    }
+    return map;
+  }
 }
 
 class $SharedTodosTable extends SharedTodos
@@ -871,18 +901,19 @@ class $SharedTodosTable extends SharedTodos
   @override
   final String actualTableName = 'shared_todos';
   @override
-  VerificationContext validateIntegrity(SharedTodosCompanion d,
+  VerificationContext validateIntegrity(Insertable<SharedTodo> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.todo.present) {
+    final data = instance.toColumns(true);
+    if (data.containsKey('todo')) {
       context.handle(
-          _todoMeta, todo.isAcceptableValue(d.todo.value, _todoMeta));
+          _todoMeta, todo.isAcceptableOrUnknown(data['todo'], _todoMeta));
     } else if (isInserting) {
       context.missing(_todoMeta);
     }
-    if (d.user.present) {
+    if (data.containsKey('user')) {
       context.handle(
-          _userMeta, user.isAcceptableValue(d.user.value, _userMeta));
+          _userMeta, user.isAcceptableOrUnknown(data['user'], _userMeta));
     } else if (isInserting) {
       context.missing(_userMeta);
     }
@@ -897,18 +928,6 @@ class $SharedTodosTable extends SharedTodos
     return SharedTodo.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(SharedTodosCompanion d) {
-    final map = <String, Variable>{};
-    if (d.todo.present) {
-      map['todo'] = Variable<int>(d.todo.value);
-    }
-    if (d.user.present) {
-      map['user'] = Variable<int>(d.user.value);
-    }
-    return map;
-  }
-
   @override
   $SharedTodosTable createAlias(String alias) {
     return $SharedTodosTable(_db, alias);
@@ -940,6 +959,22 @@ class TableWithoutPKData extends DataClass
           stringType.mapFromDatabaseResponse(data['${effectivePrefix}custom'])),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || notReallyAnId != null) {
+      map['not_really_an_id'] = Variable<int>(notReallyAnId);
+    }
+    if (!nullToAbsent || someFloat != null) {
+      map['some_float'] = Variable<double>(someFloat);
+    }
+    if (!nullToAbsent || custom != null) {
+      final converter = $TableWithoutPKTable.$converter0;
+      map['custom'] = Variable<String>(converter.mapToSql(custom));
+    }
+    return map;
+  }
+
   factory TableWithoutPKData.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -964,20 +999,6 @@ class TableWithoutPKData extends DataClass
     };
   }
 
-  @override
-  TableWithoutPKCompanion createCompanion(bool nullToAbsent) {
-    return TableWithoutPKCompanion(
-      notReallyAnId: notReallyAnId == null && nullToAbsent
-          ? const Value.absent()
-          : Value(notReallyAnId),
-      someFloat: someFloat == null && nullToAbsent
-          ? const Value.absent()
-          : Value(someFloat),
-      custom:
-          custom == null && nullToAbsent ? const Value.absent() : Value(custom),
-    );
-  }
-
   TableWithoutPKData copyWith(
           {int notReallyAnId, double someFloat, MyCustomObject custom}) =>
       TableWithoutPKData(
@@ -1032,6 +1053,22 @@ class TableWithoutPKCompanion extends UpdateCompanion<TableWithoutPKData> {
       custom: custom ?? this.custom,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (notReallyAnId.present) {
+      map['not_really_an_id'] = Variable<int>(notReallyAnId.value);
+    }
+    if (someFloat.present) {
+      map['some_float'] = Variable<double>(someFloat.value);
+    }
+    if (custom.present) {
+      final converter = $TableWithoutPKTable.$converter0;
+      map['custom'] = Variable<String>(converter.mapToSql(custom.value));
+    }
+    return map;
+  }
 }
 
 class $TableWithoutPKTable extends TableWithoutPK
@@ -1086,20 +1123,21 @@ class $TableWithoutPKTable extends TableWithoutPK
   @override
   final String actualTableName = 'table_without_p_k';
   @override
-  VerificationContext validateIntegrity(TableWithoutPKCompanion d,
+  VerificationContext validateIntegrity(Insertable<TableWithoutPKData> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.notReallyAnId.present) {
+    final data = instance.toColumns(true);
+    if (data.containsKey('not_really_an_id')) {
       context.handle(
           _notReallyAnIdMeta,
-          notReallyAnId.isAcceptableValue(
+          notReallyAnId.isAcceptableOrUnknown(
-              d.notReallyAnId.value, _notReallyAnIdMeta));
+              data['not_really_an_id'], _notReallyAnIdMeta));
     } else if (isInserting) {
       context.missing(_notReallyAnIdMeta);
     }
-    if (d.someFloat.present) {
+    if (data.containsKey('some_float')) {
       context.handle(_someFloatMeta,
-          someFloat.isAcceptableValue(d.someFloat.value, _someFloatMeta));
+          someFloat.isAcceptableOrUnknown(data['some_float'], _someFloatMeta));
     } else if (isInserting) {
       context.missing(_someFloatMeta);
     }
@@ -1115,22 +1153,6 @@ class $TableWithoutPKTable extends TableWithoutPK
     return TableWithoutPKData.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(TableWithoutPKCompanion d) {
-    final map = <String, Variable>{};
-    if (d.notReallyAnId.present) {
-      map['not_really_an_id'] = Variable<int>(d.notReallyAnId.value);
-    }
-    if (d.someFloat.present) {
-      map['some_float'] = Variable<double>(d.someFloat.value);
-    }
-    if (d.custom.present) {
-      final converter = $TableWithoutPKTable.$converter0;
-      map['custom'] = Variable<String>(converter.mapToSql(d.custom.value));
-    }
-    return map;
-  }
-
   @override
   $TableWithoutPKTable createAlias(String alias) {
     return $TableWithoutPKTable(_db, alias);
@@ -1154,6 +1176,18 @@ class PureDefault extends DataClass implements Insertable<PureDefault> {
       txt: stringType.mapFromDatabaseResponse(data['${effectivePrefix}insert']),
     );
   }
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (!nullToAbsent || id != null) {
+      map['id'] = Variable<int>(id);
+    }
+    if (!nullToAbsent || txt != null) {
+      map['insert'] = Variable<String>(txt);
+    }
+    return map;
+  }
+
   factory PureDefault.fromJson(Map<String, dynamic> json,
       {ValueSerializer serializer}) {
     serializer ??= moorRuntimeOptions.defaultSerializer;
@@ -1176,14 +1210,6 @@ class PureDefault extends DataClass implements Insertable<PureDefault> {
     };
   }
 
-  @override
-  PureDefaultsCompanion createCompanion(bool nullToAbsent) {
-    return PureDefaultsCompanion(
-      id: id == null && nullToAbsent ? const Value.absent() : Value(id),
-      txt: txt == null && nullToAbsent ? const Value.absent() : Value(txt),
-    );
-  }
-
   PureDefault copyWith({int id, String txt}) => PureDefault(
         id: id ?? this.id,
         txt: txt ?? this.txt,
@@ -1222,6 +1248,18 @@ class PureDefaultsCompanion extends UpdateCompanion<PureDefault> {
       txt: txt ?? this.txt,
     );
   }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (txt.present) {
+      map['insert'] = Variable<String>(txt.value);
+    }
+    return map;
+  }
 }
 
 class $PureDefaultsTable extends PureDefaults
@@ -1259,14 +1297,16 @@ class $PureDefaultsTable extends PureDefaults
   @override
   final String actualTableName = 'pure_defaults';
   @override
-  VerificationContext validateIntegrity(PureDefaultsCompanion d,
+  VerificationContext validateIntegrity(Insertable<PureDefault> instance,
       {bool isInserting = false}) {
     final context = VerificationContext();
-    if (d.id.present) {
+    final data = instance.toColumns(true);
-      context.handle(_idMeta, id.isAcceptableValue(d.id.value, _idMeta));
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id'], _idMeta));
     }
-    if (d.txt.present) {
+    if (data.containsKey('insert')) {
-      context.handle(_txtMeta, txt.isAcceptableValue(d.txt.value, _txtMeta));
+      context.handle(
+          _txtMeta, txt.isAcceptableOrUnknown(data['insert'], _txtMeta));
     }
     return context;
   }
@@ -1279,18 +1319,6 @@ class $PureDefaultsTable extends PureDefaults
     return PureDefault.fromData(data, _db, prefix: effectivePrefix);
   }
 
-  @override
-  Map<String, Variable> entityToSql(PureDefaultsCompanion d) {
-    final map = <String, Variable>{};
-    if (d.id.present) {
-      map['id'] = Variable<int>(d.id.value);
-    }
-    if (d.txt.present) {
-      map['insert'] = Variable<String>(d.txt.value);
-    }
-    return map;
-  }
-
   @override
   $PureDefaultsTable createAlias(String alias) {
     return $PureDefaultsTable(_db, alias);

moor_generator/lib/src/writer/tables/data_class_writer.dart

@@ -1,4 +1,5 @@
 import 'package:moor_generator/moor_generator.dart';
+import 'package:moor_generator/src/utils/string_escaper.dart';
 import 'package:moor_generator/writer.dart';
 import 'package:recase/recase.dart';
 
@@ -38,10 +39,11 @@ class DataClassWriter {
     // Also write parsing factory
     _writeMappingConstructor();
 
+    _writeToColumnsOverride();
+
     // And a serializer and deserializer method
     _writeFromJson();
     _writeToJson();
-    _writeCompanionOverride();
 
     // And a convenience method to copy data from this class.
     _writeCopyWith();
@@ -178,6 +180,40 @@ class DataClassWriter {
     _buffer.write(');');
   }
 
+  void _writeToColumnsOverride() {
+    _buffer
+      ..write('@override\nMap<String, Expression> toColumns'
+          '(bool nullToAbsent) {\n')
+      ..write('final map = <String, Expression> {};');
+
+    for (final column in table.columns) {
+      _buffer.write('if (!nullToAbsent || ${column.dartGetterName} != null) {');
+      final mapSetter = 'map[${asDartLiteral(column.name.name)}] = '
+          'Variable<${column.variableTypeName}>';
+
+      if (column.typeConverter != null) {
+        // apply type converter before writing the variable
+        final converter = column.typeConverter;
+        final fieldName = '${table.tableInfoName}.${converter.fieldName}';
+        _buffer
+          ..write('final converter = $fieldName;\n')
+          ..write(mapSetter)
+          ..write('(converter.mapToSql(${column.dartGetterName}));');
+      } else {
+        // no type converter. Write variable directly
+        _buffer
+          ..write(mapSetter)
+          ..write('(')
+          ..write(column.dartGetterName)
+          ..write(');');
+      }
+
+      _buffer.write('}');
+    }
+
+    _buffer.write('return map; \n}\n');
+  }
+
   void _writeToString() {
     /*
       @override
@@ -214,20 +250,4 @@ class DataClassWriter {
     const HashCodeWriter().writeHashCode(fields, _buffer);
     _buffer.write(';');
   }
-
-  void _writeCompanionOverride() {
-    // TableCompanion createCompanion(bool nullToAbsent)
-
-    final companionClass = table.getNameForCompanionClass(scope.options);
-    _buffer.write('@override\n'
-        '$companionClass createCompanion(bool nullToAbsent) {\n'
-        'return $companionClass(');
-
-    for (final column in table.columns) {
-      final getter = column.dartGetterName;
-      _buffer.write('$getter: $getter == null && nullToAbsent ? '
-          'const Value.absent() : Value($getter),');
-    }
-    _buffer.write(');}\n');
-  }
 }

moor_generator/lib/src/writer/tables/table_writer.dart

@@ -66,7 +66,7 @@ class TableWriter {
     _writePrimaryKeyOverride();
 
     _writeMappingMethod();
-    _writeReverseMappingMethod();
+    // _writeReverseMappingMethod();
 
     _writeAliasGenerator();
 
@@ -98,41 +98,6 @@ class TableWriter {
       ..write('}\n');
   }
 
-  void _writeReverseMappingMethod() {
-    // Map<String, Variable> entityToSql(covariant UpdateCompanion<D> instance)
-    _buffer
-      ..write('@override\nMap<String, Variable> entityToSql('
-          '${table.getNameForCompanionClass(scope.options)} d) {\n')
-      ..write('final map = <String, Variable> {};');
-
-    for (final column in table.columns) {
-      _buffer.write('if (d.${column.dartGetterName}.present) {');
-      final mapSetter = 'map[${asDartLiteral(column.name.name)}] = '
-          'Variable<${column.variableTypeName}>';
-
-      if (column.typeConverter != null) {
-        // apply type converter before writing the variable
-        final converter = column.typeConverter;
-        final fieldName = '${table.tableInfoName}.${converter.fieldName}';
-        _buffer
-          ..write('final converter = $fieldName;\n')
-          ..write(mapSetter)
-          ..write('(converter.mapToSql(d.${column.dartGetterName}.value));');
-      } else {
-        // no type converter. Write variable directly
-        _buffer
-          ..write(mapSetter)
-          ..write('(')
-          ..write('d.${column.dartGetterName}.value')
-          ..write(');');
-      }
-
-      _buffer.write('}');
-    }
-
-    _buffer.write('return map; \n}\n');
-  }
-
   void _writeColumnGetter(MoorColumn column) {
     final isNullable = column.nullable;
     final additionalParams = <String, String>{};
@@ -212,9 +177,10 @@ class TableWriter {
 
     _buffer
       ..write('@override\nVerificationContext validateIntegrity'
-          '(${table.getNameForCompanionClass(scope.options)} d, '
+          '(Insertable<${table.dartTypeName}> instance, '
           '{bool isInserting = false}) {\n')
-      ..write('final context = VerificationContext();\n');
+      ..write('final context = VerificationContext();\n')
+      ..write('final data = instance.toColumns(true);\n');
 
     for (final column in table.columns) {
       final getterName = column.dartGetterName;
@@ -228,11 +194,13 @@ class TableWriter {
         continue;
       }
 
+      final columnNameString = asDartLiteral(column.name.name);
       _buffer
-        ..write('if (d.$getterName.present) {\n')
+        ..write('if (data.containsKey($columnNameString)) {\n')
         ..write('context.handle('
             '$metaName, '
-            '$getterName.isAcceptableValue(d.$getterName.value, $metaName));')
+            '$getterName.isAcceptableOrUnknown('
+            'data[$columnNameString], $metaName));')
         ..write('}');
 
       if (table.isColumnRequiredForInsert(column)) {

moor_generator/lib/src/writer/tables/update_companion_writer.dart

@@ -1,4 +1,5 @@
 import 'package:moor_generator/moor_generator.dart';
+import 'package:moor_generator/src/utils/string_escaper.dart';
 import 'package:moor_generator/writer.dart';
 
 class UpdateCompanionWriter {
@@ -18,6 +19,7 @@ class UpdateCompanionWriter {
     _writeConstructor();
     _writeInsertConstructor();
     _writeCopyWith();
+    _writeToColumnsOverride();
 
     _buffer.write('}\n');
   }
@@ -107,4 +109,39 @@ class UpdateCompanionWriter {
     }
     _buffer.write(');\n}\n');
   }
+
+  void _writeToColumnsOverride() {
+    // Map<String, Variable> entityToSql(covariant UpdateCompanion<D> instance)
+    _buffer
+      ..write('@override\nMap<String, Expression> toColumns'
+          '(bool nullToAbsent) {\n')
+      ..write('final map = <String, Expression> {};');
+
+    for (final column in table.columns) {
+      _buffer.write('if (${column.dartGetterName}.present) {');
+      final mapSetter = 'map[${asDartLiteral(column.name.name)}] = '
+          'Variable<${column.variableTypeName}>';
+
+      if (column.typeConverter != null) {
+        // apply type converter before writing the variable
+        final converter = column.typeConverter;
+        final fieldName = '${table.tableInfoName}.${converter.fieldName}';
+        _buffer
+          ..write('final converter = $fieldName;\n')
+          ..write(mapSetter)
+          ..write('(converter.mapToSql(${column.dartGetterName}.value));');
+      } else {
+        // no type converter. Write variable directly
+        _buffer
+          ..write(mapSetter)
+          ..write('(')
+          ..write('${column.dartGetterName}.value')
+          ..write(');');
+      }
+
+      _buffer.write('}');
+    }
+
+    _buffer.write('return map; \n}\n');
+  }
 }