fix tests

GetDutchie · Dec 15, 2024 · 5e4ae6e · 5e4ae6e
1 parent d94806b
commit 5e4ae6e
Show file tree

Hide file tree

Showing 4 changed files with 278 additions and 41 deletions.
diff --git a/packages/brick_sqlite/lib/brick_sqlite.dart b/packages/brick_sqlite/lib/brick_sqlite.dart
@@ -5,3 +5,4 @@ export 'package:brick_sqlite/src/runtime_sqlite_column_definition.dart';
 export 'package:brick_sqlite/src/sqlite_adapter.dart';
 export 'package:brick_sqlite/src/sqlite_model_dictionary.dart';
 export 'package:brick_sqlite/src/sqlite_provider.dart';
+export 'package:brick_sqlite/src/sqlite_provider_query.dart';
diff --git a/packages/brick_sqlite/lib/src/helpers/query_sql_transformer.dart b/packages/brick_sqlite/lib/src/helpers/query_sql_transformer.dart
@@ -5,6 +5,8 @@ import 'package:brick_sqlite/src/models/sqlite_model.dart';
 import 'package:brick_sqlite/src/runtime_sqlite_column_definition.dart';
 import 'package:brick_sqlite/src/sqlite_adapter.dart';
 import 'package:brick_sqlite/src/sqlite_model_dictionary.dart';
+import 'package:brick_sqlite/src/sqlite_provider.dart';
+import 'package:brick_sqlite/src/sqlite_provider_query.dart';
 import 'package:meta/meta.dart' show protected;
 
 /// Create a prepared SQLite statement for eventual execution. Only [statement] and [values]
@@ -89,7 +91,7 @@ class QuerySqlTransformer<_Model extends SqliteModel> {
 
     _statement.add(
       AllOtherClausesFragment(
-        query?.providerArgs ?? {},
+        query,
         fieldsToColumns: adapter.fieldsToSqliteColumns,
       ).toString(),
     );
@@ -343,7 +345,7 @@ class AllOtherClausesFragment {
   final Map<String, RuntimeSqliteColumnDefinition> fieldsToColumns;
 
   ///
-  final Map<String, dynamic> providerArgs;
+  final Query? query;
 
   /// Order matters. For example, LIMIT has to follow an ORDER BY but precede an OFFSET.
   static const _supportedOperators = <String, String>{
@@ -355,48 +357,62 @@ class AllOtherClausesFragment {
     'offset': 'OFFSET',
   };
 
-  /// These operators declare a column to compare against. The fields provided in [providerArgs]
-  /// will have to be converted to their column name.
+  /// These operators declare a column to compare against. The fields provided in
+  /// [Query] or [SqliteProviderQuery] will have to be converted to their column name.
   /// For example, `orderBy: [OrderBy.asc('createdAt')]` must become `ORDER BY created_at ASC`.
   static const _operatorsDeclaringFields = <String>{'ORDER BY', 'GROUP BY', 'HAVING'};
 
   /// Query modifiers such as `LIMIT`, `OFFSET`, etc. that require minimal logic.
   AllOtherClausesFragment(
-    Map<String, dynamic>? providerArgs, {
+    this.query, {
     required this.fieldsToColumns,
-  }) : providerArgs = providerArgs ?? {};
+  });
 
   @override
-  String toString() => _supportedOperators.entries.fold<List<String>>(<String>[], (acc, entry) {
-        final op = entry.value;
-        var value = providerArgs[entry.key];
-
-        if (value == null) return acc;
-
-        if (_operatorsDeclaringFields.contains(op)) {
-          value = value.toString().split(',').fold<String>(value.toString(),
-              (modValue, innerValueClause) {
-            final fragment = innerValueClause.trim().split(' ');
-            if (fragment.isEmpty) return modValue;
-
-            final fieldName = fragment.first;
-            final columnDefinition = fieldsToColumns[fieldName];
-            var columnName = columnDefinition?.columnName;
-            if (columnName != null && modValue.contains(fieldName)) {
-              if (columnDefinition!.type == DateTime) {
-                columnName = 'datetime($columnName)';
-              }
-              return modValue.replaceAll(fieldName, columnName);
+  String toString() {
+    final providerQuery = query?.providerQueries[SqliteProvider] as SqliteProviderQuery?;
+    final argsToSqlStatments = {
+      ...?query?.providerArgs,
+      if (providerQuery?.collate != null) 'collate': providerQuery?.collate,
+      if (query?.limit != null) 'limit': query?.limit,
+      if (query?.offset != null) 'offset': query?.offset,
+      if (query?.orderBy.isNotEmpty ?? false)
+        'orderBy': query?.orderBy.map((p) => p.toString()).join(', '),
+      if (providerQuery?.groupBy != null) 'groupBy': providerQuery?.groupBy,
+      if (providerQuery?.having != null) 'having': providerQuery?.having,
+    };
+
+    return _supportedOperators.entries.fold<List<String>>(<String>[], (acc, entry) {
+      final op = entry.value;
+      var value = argsToSqlStatments[entry.key];
+
+      if (value == null) return acc;
+
+      if (_operatorsDeclaringFields.contains(op)) {
+        value = value.toString().split(',').fold<String>(value.toString(),
+            (modValue, innerValueClause) {
+          final fragment = innerValueClause.trim().split(' ');
+          if (fragment.isEmpty) return modValue;
+
+          final fieldName = fragment.first;
+          final columnDefinition = fieldsToColumns[fieldName];
+          var columnName = columnDefinition?.columnName;
+          if (columnName != null && modValue.contains(fieldName)) {
+            if (columnDefinition!.type == DateTime) {
+              columnName = 'datetime($columnName)';
             }
+            return modValue.replaceAll(fieldName, columnName);
+          }
 
-            return modValue;
-          });
-        }
+          return modValue;
+        });
+      }
 
-        acc.add('$op $value');
+      acc.add('$op $value');
 
-        return acc;
-      }).join(' ');
+      return acc;
+    }).join(' ');
+  }
 }
 
 // Taken directly from the Dart collection package

diff --git a/packages/brick_sqlite/lib/src/sqlite_provider_query.dart b/packages/brick_sqlite/lib/src/sqlite_provider_query.dart
@@ -0,0 +1,35 @@
+import 'package:brick_core/query.dart';
+import 'package:brick_sqlite/src/sqlite_provider.dart';
+
+class SqliteProviderQuery extends ProviderQuery<SqliteProvider> {
+  final String? collate;
+
+  final String? groupBy;
+
+  final String? having;
+
+  const SqliteProviderQuery({
+    this.collate,
+    this.groupBy,
+    this.having,
+  });
+
+  @override
+  Map<String, dynamic> toJson() => {
+        if (collate != null) 'collate': collate,
+        if (groupBy != null) 'groupBy': groupBy,
+        if (having != null) 'having': having,
+      };
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SqliteProviderQuery &&
+          runtimeType == other.runtimeType &&
+          collate == other.collate &&
+          groupBy == other.groupBy &&
+          having == other.having;
+
+  @override
+  int get hashCode => collate.hashCode ^ groupBy.hashCode ^ having.hashCode;
+}