null safety

example/pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -196,7 +196,7 @@ packages:
       path: "../floor"
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.1.0"
   floor_annotation:
     dependency: transitive
     description:
@@ -210,7 +210,7 @@ packages:
       path: "../floor_generator"
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -372,7 +372,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sqflite:
     dependency: transitive
     description:
@@ -449,7 +449,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:

floor/lib/src/adapter/query_adapter.dart

@@ -17,9 +17,12 @@ class QueryAdapter {
   Future<T?> query<T>(
     final String sql, {
     final List<Object>? arguments,
+    final bool isRaw = false,
     required final T Function(Map<String, Object?>) mapper,
   }) async {
-    final rows = await _database.rawQuery(sql, arguments);
+    final rows = await (isRaw
+        ? _database.rawQuery(sql.replaceAll('?', arguments![0] as String))
+        : _database.rawQuery(sql, arguments));
 
     if (rows.isEmpty) {
       return null;
@@ -38,20 +41,21 @@ class QueryAdapter {
     required final T Function(Map<String, Object?>) mapper,
   }) async {
     final rows = await (isRaw
-        ? _database.rawQuery(sql.replaceAll('?', arguments[0]))
+        ? _database.rawQuery(sql.replaceAll('?', arguments![0] as String))
         : _database.rawQuery(sql, arguments));
     return rows.map((row) => mapper(row)).toList();
   }
 
   Future<void> queryNoReturn(
     final String sql, {
     final List<Object>? arguments,
+    final bool isRaw = false,
   }) async {
     // TODO #94 differentiate between different query kinds (select, update, delete, insert)
     //  this enables to notify the observers
     //  also requires extracting the table name :(
     await (isRaw
-        ? _database.rawQuery(sql.replaceAll('?', arguments[0]))
+        ? _database.rawQuery(sql.replaceAll('?', arguments![0] as String))
         : _database.rawQuery(sql, arguments));
   }
 

floor/pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -203,7 +203,7 @@ packages:
       path: "../floor_generator"
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -372,7 +372,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   sqflite:
     dependency: "direct main"
     description:
@@ -449,7 +449,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:

floor_annotation/lib/src/query.dart

@@ -3,7 +3,7 @@ class Query {
   /// The SQLite query.
   final String value;
 
-  final bool isRaw;
+  final bool? isRaw;
 
   /// Marks a method as a query method.
   const Query(this.value, {this.isRaw});

floor_generator/lib/processor/query_method_processor.dart

@@ -103,7 +103,7 @@ class QueryMethodProcessor extends Processor<QueryMethod> {
 
   bool _getIsRaw() {
     final isRaw = _methodElement
-        .getAnnotation(annotations.Query)
+        .getAnnotation(annotations.Query)!
         .getField(AnnotationField.isRaw)
         ?.toBoolValue();
 

floor_generator/lib/value_object/query_method.dart

@@ -17,7 +17,7 @@ class QueryMethod {
   /// Query where the parameter mapping is stored.
   final Query query;
 
-  final bool isRaw;
+  final bool? isRaw;
 
   final DartType rawReturnType;
 
@@ -38,17 +38,15 @@ class QueryMethod {
   final Set<TypeConverter> typeConverters;
 
   QueryMethod(
-    this.methodElement,
-    this.name,
-    this.query,
-    this.rawReturnType,
-    this.flattenedReturnType,
-    this.parameters,
-    this.queryable,
-    this.typeConverters, {
-      this.isRaw
-    }
-  );
+      this.methodElement,
+      this.name,
+      this.query,
+      this.rawReturnType,
+      this.flattenedReturnType,
+      this.parameters,
+      this.queryable,
+      this.typeConverters,
+      {this.isRaw});
 
   bool get returnsList {
     final type = returnsStream

floor_generator/lib/writer/query_method_writer.dart

@@ -163,7 +163,7 @@ class QueryMethodWriter implements Writer {
   String _generateNoReturnQuery(final String query, final String? arguments) {
     final parameters = StringBuffer(query);
     if (arguments != null) parameters.write(', arguments: $arguments');
-    if (_queryMethod.isRaw) parameters.write(', isRaw: true');
+    if (_queryMethod.isRaw!) parameters.write(', isRaw: true');
     return 'await _queryAdapter.queryNoReturn($parameters);';
   }
 
@@ -175,7 +175,7 @@ class QueryMethodWriter implements Writer {
     final mapper = _generateMapper(queryable);
     final parameters = StringBuffer(query)..write(', mapper: $mapper');
     if (arguments != null) parameters.write(', arguments: $arguments');
-    if (_queryMethod.isRaw) parameters.write(', isRaw: true');
+    if (_queryMethod.isRaw!) parameters.write(', isRaw: true');
 
     if (_queryMethod.returnsStream) {
       // for streamed queries, we need to provide the queryable to know which