Integrate sqlparser

README.md

@@ -396,11 +396,6 @@ You can then query the view via a DAO function like an entity.
 
 It is possible for DatabaseViews to inherit common fields from a base class, just like in entities.
 
-#### Limitations
-- It is now possible to return a `Stream` object from a DAO method which queries a database view. But it will fire on **any** 
-  `@update`, `@insert`, `@delete` events in the whole database, which can get quite taxing on the runtime. Please add it only if you know what you are doing!
-  This is mostly due to the complexity of detecting which entities are involved in a database view.
-
 ## Data Access Objects
 These components are responsible for managing access to the underlying SQLite database and are defined as abstract classes with method signatures and query statements.
 DAO classes can use inherited methods by implementing and extending classes while also using mixins.
@@ -421,9 +416,8 @@ abstract class PersonDao {
 
 ### Queries
 Method signatures turn into query methods by adding the `@Query()` annotation with the query in parenthesis to them.
-Be patient about the correctness of your SQL statements.
-They are only partly validated while generating the code.
-These queries have to return either a `Future` or a `Stream` of an entity or `void`.
+Your SQL queries will be validated completely while generating the code.
+These queries have to return either a `Future` or a `Stream` of an entity, a view, a primitive value or `void`.
 Returning `Future<void>` comes in handy whenever you want to delete the full content of a table, for instance.
 Some query method examples can be seen in the following.
 
@@ -460,6 +454,13 @@ final name = '%foo%';
 await dao.findPersonsWithNamesLike(name);
 ```
 
+#### Limitations
+- Supplying more than one query (separated by a semicolon) will not work. 
+  Please use transactions or successive calls to DAO-Methods instead.
+- The underlying frameworks only support up to 999 different parameters. This 
+  seems like a big number, but each element of a list parameter counts towards it
+  and the length of these lists could change at runtime.  
+
 ### Data Changes
 Use the `@insert`, `@update` and `@delete` annotations for inserting and changing persistent data.
 All these methods accept single or multiple entity instances.
@@ -520,11 +521,6 @@ StreamBuilder<List<Person>>(
 ```
 
 #### Limitations
-- Only methods annotated with `@insert`, `@update` and `@delete` trigger `Stream` emissions. 
-  Inserting data by using the `@Query()` annotation doesn't.
-- It is now possible to return a `Stream` if the function queries a database view. But it will fire on **any** 
-  `@update`, `@insert`, `@delete` events in the whole database, which can get quite taxing on the runtime. Please add it only if you know what you are doing!
-  This is mostly due to the complexity of detecting which entities are involved in a database view.
 - Functions returning a stream of single items such as `Stream<Person>` do not emit when there is no query result.
 
 ### Transactions

floor/README.md

@@ -396,11 +396,6 @@ You can then query the view via a DAO function like an entity.
 
 It is possible for DatabaseViews to inherit common fields from a base class, just like in entities.
 
-#### Limitations
-- It is now possible to return a `Stream` object from a DAO method which queries a database view. But it will fire on **any** 
-  `@update`, `@insert`, `@delete` events in the whole database, which can get quite taxing on the runtime. Please add it only if you know what you are doing!
-  This is mostly due to the complexity of detecting which entities are involved in a database view.
-
 ## Data Access Objects
 These components are responsible for managing access to the underlying SQLite database and are defined as abstract classes with method signatures and query statements.
 DAO classes can use inherited methods by implementing and extending classes while also using mixins.
@@ -421,9 +416,8 @@ abstract class PersonDao {
 
 ### Queries
 Method signatures turn into query methods by adding the `@Query()` annotation with the query in parenthesis to them.
-Be patient about the correctness of your SQL statements.
-They are only partly validated while generating the code.
-These queries have to return either a `Future` or a `Stream` of an entity or `void`.
+Your SQL queries will be validated completely while generating the code.
+These queries have to return either a `Future` or a `Stream` of an entity, a view, a primitive value or `void`.
 Returning `Future<void>` comes in handy whenever you want to delete the full content of a table, for instance.
 Some query method examples can be seen in the following.
 
@@ -460,6 +454,13 @@ final name = '%foo%';
 await dao.findPersonsWithNamesLike(name);
 ```
 
+#### Limitations
+- Supplying more than one query (separated by a semicolon) will not work. 
+  Please use transactions or successive calls to DAO-Methods instead.
+- The underlying frameworks only support up to 999 different parameters. This 
+  seems like a big number, but each element of a list parameter counts towards it
+  and the length of these lists could change at runtime.  
+
 ### Data Changes
 Use the `@insert`, `@update` and `@delete` annotations for inserting and changing persistent data.
 All these methods accept single or multiple entity instances.
@@ -520,11 +521,6 @@ StreamBuilder<List<Person>>(
 ```
 
 #### Limitations
-- Only methods annotated with `@insert`, `@update` and `@delete` trigger `Stream` emissions. 
-  Inserting data by using the `@Query()` annotation doesn't.
-- It is now possible to return a `Stream` if the function queries a database view. But it will fire on **any** 
-  `@update`, `@insert`, `@delete` events in the whole database, which can get quite taxing on the runtime. Please add it only if you know what you are doing!
-  This is mostly due to the complexity of detecting which entities are involved in a database view.
 - Functions returning a stream of single items such as `Stream<Person>` do not emit when there is no query result.
 
 ### Transactions

floor/lib/src/adapter/query_adapter.dart

@@ -39,25 +39,32 @@ class QueryAdapter {
     @required final T Function(Map<String, dynamic>) mapper,
   }) async {
     final rows = await _database.rawQuery(sql, arguments);
-    return rows.map((row) => mapper(row)).toList();
+
+    return rows.map(mapper).toList();
   }
 
+  /// Executes a SQLite query that does not return any values.
+  /// It will also trigger the [_changeListener] of affected entities if this
+  /// query is expected to change something.
   Future<void> queryNoReturn(
     final String sql, {
     final List<dynamic> arguments,
+    final Set<String> changedEntities,
   }) 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 _database.rawQuery(sql, arguments);
+
+    if (_changeListener != null &&
+        changedEntities != null &&
+        changedEntities.isNotEmpty) {
+      changedEntities.forEach(_changeListener.add);
+    }
   }
 
   /// Executes a SQLite query that returns a stream of single query results.
   Stream<T> queryStream<T>(
     final String sql, {
     final List<dynamic> arguments,
-    @required final String queryableName,
-    @required final bool isView,
+    @required final Set<String> dependencies,
     @required final T Function(Map<String, dynamic>) mapper,
   }) {
     assert(_changeListener != null);
@@ -71,14 +78,12 @@ class QueryAdapter {
 
     controller.onListen = () async => executeQueryAndNotifyController();
 
-    // listen on all updates if the stream is on a view, only listen to the
-    // name of the table if the stream is on a entity.
+    // listen on all updates where the updated table
+    // is one of the dependencies of this query.
     final subscription = _changeListener.stream
-        .where((updatedTable) => updatedTable == queryableName || isView)
-        .listen(
-          (_) async => executeQueryAndNotifyController(),
-          onDone: () => controller.close(),
-        );
+        .where(dependencies.contains)
+        .listen((_) async => executeQueryAndNotifyController(),
+            onDone: () => controller.close());
 
     controller.onCancel = () => subscription.cancel();
 
@@ -89,8 +94,7 @@ class QueryAdapter {
   Stream<List<T>> queryListStream<T>(
     final String sql, {
     final List<dynamic> arguments,
-    @required final String queryableName,
-    @required final bool isView,
+    @required final Set<String> dependencies,
     @required final T Function(Map<String, dynamic>) mapper,
   }) {
     assert(_changeListener != null);
@@ -104,13 +108,12 @@ class QueryAdapter {
 
     controller.onListen = () async => executeQueryAndNotifyController();
 
-    // Views listen on all events, Entities only on events that changed the same entity.
+    // listen on all updates where the updated table
+    // is one of the dependencies of this query.
     final subscription = _changeListener.stream
-        .where((updatedTable) => isView || updatedTable == queryableName)
-        .listen(
-          (_) async => executeQueryAndNotifyController(),
-          onDone: () => controller.close(),
-        );
+        .where(dependencies.contains)
+        .listen((_) async => executeQueryAndNotifyController(),
+            onDone: () => controller.close());
 
     controller.onCancel = () => subscription.cancel();
 

floor/test/adapter/query_adapter_test.dart

@@ -134,6 +134,33 @@ void main() {
 
         verify(mockDatabaseExecutor.rawQuery(sql, arguments));
       });
+
+      test('executes query with update', () async {
+        final streamController = StreamController<String>();
+        const entityName = 'person';
+
+        final underTest = QueryAdapter(mockDatabaseExecutor, streamController);
+
+        final arguments = [123];
+        await underTest.queryNoReturn(sql,
+            arguments: arguments, changedEntities: {entityName});
+
+        expect(streamController.stream, emits(entityName));
+        verify(mockDatabaseExecutor.rawQuery(sql, arguments));
+
+        await streamController.close();
+      });
+
+      test('executes query with update with no _changeListener present',
+          () async {
+        const entityName = 'person';
+
+        final arguments = [123];
+        await underTest.queryNoReturn(sql,
+            arguments: arguments, changedEntities: {entityName});
+
+        verify(mockDatabaseExecutor.rawQuery(sql, arguments));
+      });
     });
   });
 
@@ -162,7 +189,7 @@ void main() {
       when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
 
       final actual = underTest.queryStream(sql,
-          queryableName: entityName, isView: false, mapper: mapper);
+          dependencies: {entityName}, mapper: mapper);
 
       expect(actual, emits(person));
     });
@@ -179,8 +206,7 @@ void main() {
       final actual = underTest.queryStream(
         sql,
         arguments: arguments,
-        queryableName: entityName,
-        isView: false,
+        dependencies: {entityName},
         mapper: mapper,
       );
 
@@ -195,7 +221,7 @@ void main() {
       when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
 
       final actual = underTest.queryStream(sql,
-          queryableName: entityName, isView: false, mapper: mapper);
+          dependencies: {entityName}, mapper: mapper);
       streamController.add(entityName);
 
       expect(actual, emitsInOrder(<Person>[person, person]));
@@ -211,7 +237,7 @@ void main() {
       when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
 
       final actual = underTest.queryListStream(sql,
-          queryableName: entityName, isView: false, mapper: mapper);
+          dependencies: {entityName}, mapper: mapper);
 
       expect(actual, emits([person, person2]));
     });
@@ -230,8 +256,7 @@ void main() {
       final actual = underTest.queryListStream(
         sql,
         arguments: arguments,
-        queryableName: entityName,
-        isView: false,
+        dependencies: {entityName},
         mapper: mapper,
       );
 
@@ -248,7 +273,7 @@ void main() {
       when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
 
       final actual = underTest.queryListStream(sql,
-          queryableName: entityName, isView: false, mapper: mapper);
+          dependencies: {entityName}, mapper: mapper);
       streamController.add(entityName);
 
       expect(
@@ -262,6 +287,7 @@ void main() {
 
     test('query stream from view with same and different triggering entity',
         () async {
+      const otherEntity = 'otherEntity';
       final person = Person(1, 'Frank');
       final person2 = Person(2, 'Peter');
       final queryResult = Future(() => [
@@ -271,7 +297,7 @@ void main() {
       when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
 
       final actual = underTest.queryListStream(sql,
-          queryableName: entityName, isView: true, mapper: mapper);
+          dependencies: {entityName, otherEntity}, mapper: mapper);
       expect(
         actual,
         emitsInOrder(<List<Person>>[
@@ -282,7 +308,36 @@ void main() {
       );
 
       streamController.add(entityName);
-      streamController.add('otherEntity');
+      streamController.add(otherEntity);
+    });
+
+    test('unrelated update should not update stream', () async {
+      const otherEntity = 'otherEntity';
+      final person = Person(1, 'Frank');
+      final person2 = Person(2, 'Peter');
+      final queryResult = Future(() => [
+            <String, dynamic>{'id': person.id, 'name': person.name},
+            <String, dynamic>{'id': person2.id, 'name': person2.name},
+          ]);
+      when(mockDatabaseExecutor.rawQuery(sql)).thenAnswer((_) => queryResult);
+
+      final actual = underTest.queryListStream(sql,
+          dependencies: {entityName}, mapper: mapper);
+      //first, emit the result
+      expect(
+          actual,
+          emitsInOrder(<List<Person>>[
+            [person, person2],
+          ]));
+
+      //after emitting the first result, no other updates were made
+      expect(actual.skip(1), emitsDone);
+
+      streamController.add(otherEntity);
+      streamController.add(otherEntity);
+
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+      await streamController.close();
     });
   });
 }

floor/test/integration/boolean_conversions/bool_test.dart

@@ -64,6 +64,24 @@ void main() {
       final actual = await boolDao.findWithNullable(false);
       expect(actual, equals(obj));
     });
+
+    test('return nullables', () async {
+      await boolDao
+          .insertBoolC(BooleanClass(false, nullable: null, nonnullable: true));
+      await boolDao
+          .insertBoolC(BooleanClass(true, nullable: false, nonnullable: true));
+
+      expect(await boolDao.getNullables(), equals([null, false]));
+    });
+
+    test('return nonNullables', () async {
+      await boolDao
+          .insertBoolC(BooleanClass(false, nullable: null, nonnullable: true));
+      await boolDao
+          .insertBoolC(BooleanClass(true, nullable: false, nonnullable: false));
+
+      expect(await boolDao.getNonNullables(), equals([true, false]));
+    });
   });
 }
 
@@ -108,6 +126,12 @@ abstract class BoolDao {
   @Query('SELECT * FROM BooleanClass where nonnullable = :val')
   Future<BooleanClass> findWithNonNullable(bool val);
 
+  @Query('SELECT nonnullable FROM BooleanClass')
+  Future<List<bool>> getNonNullables();
+
+  @Query('SELECT nullable FROM BooleanClass')
+  Future<List<bool>> getNullables();
+
   @Query('SELECT * FROM BooleanClass where nullable = :val')
   Future<BooleanClass> findWithNullable(bool val);