Fix issue #224

pinchbv · May 5, 2020 · ced14c4 · ced14c4
1 parent cfa25d3
commit ced14c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/floor_generator/lib/processor/query_method_processor.dart b/floor_generator/lib/processor/query_method_processor.dart
@@ -83,7 +83,7 @@ class QueryMethodProcessor extends Processor<QueryMethod> {
 
     if (query == null || query.isEmpty) throw _processorError.noQueryDefined;
 
-    final substitutedQuery = query.replaceAll(RegExp(r':[^\s)]+'), '?');
+    final substitutedQuery = query.replaceAll(RegExp(r':[.\w]+'), '?');
     _assertQueryParameters(substitutedQuery, _methodElement.parameters);
     return _replaceInClauseArguments(substitutedQuery);
   }

diff --git a/floor_generator/test/processor/query_method_processor_test.dart b/floor_generator/test/processor/query_method_processor_test.dart
@@ -180,6 +180,18 @@ void main() {
 
       expect(actual, equals('SELECT * FROM Persons WHERE name LIKE ?'));
     });
+
+    test('Parse query with commas', () async {
+      final methodElement = await _createQueryMethodElement('''
+      @Query('SELECT * FROM :table,:othertable')
+      Future<List<Person>> findPersonsWithNamesLike(String table, String othertable);
+    ''');
+
+      final actual =
+          QueryMethodProcessor(methodElement, [], []).process().query;
+
+      expect(actual, equals('SELECT * FROM ?,?'));
+    });
   });
 
   group('errors', () {