Allow using group by on view without join

Closes #3284
simolus3 · Oct 13, 2024 · d7cc547 · d7cc547
1 parent f89a8eb
commit d7cc547
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/drift/CHANGELOG.md b/drift/CHANGELOG.md
@@ -4,7 +4,8 @@
  drift now sends a test message instead serializing by default.
 - The manager API now ignores references whose target column is a foreign key itself.
 - The DevTools extension can now clear drift databases.
-
+- `View.from` is now declared to return a `JoinedSelectStatement`, the type it
+ returns at runtime.
 
 ## 2.20.2
 

diff --git a/drift/lib/src/dsl/table.dart b/drift/lib/src/dsl/table.dart
@@ -241,7 +241,7 @@ abstract class View extends HasResultSet {
  /// }
  /// ```
  @protected
- SimpleSelectStatement from(Table table) => _isGenerated();
+ JoinedSelectStatement from(Table table) => _isGenerated();
 
  /// This method is overridden by Dart-defined views to declare the right
  /// query to run.

diff --git a/drift_dev/lib/src/cli/commands/schema.dart b/drift_dev/lib/src/cli/commands/schema.dart
@@ -15,7 +15,7 @@ import 'schema/steps.dart';
 
 class SchemaCommand extends Command {
  @override
- String get description => 'Inspect or manage the schema of a moor database';
+ String get description => 'Inspect or manage the schema of a drift database';
 
  @override
  String get name => 'schema';

diff --git a/drift_dev/test/analysis/resolver/dart/view_test.dart b/drift_dev/test/analysis/resolver/dart/view_test.dart
@@ -1,7 +1,9 @@
+import 'package:build_test/build_test.dart';
 import 'package:drift/drift.dart' show DriftSqlType;
 import 'package:drift_dev/src/analysis/results/results.dart';
 import 'package:test/test.dart';
 
+import '../../../utils.dart';
 import '../../test_utils.dart';
 
 void main() {
@@ -149,4 +151,41 @@ class Database {}
  expect(view.columns.map((e) => e.nameInDart), ['id', 'id1', 'id2']);
  expect(view.columns.map((e) => e.nameInSql), ['id', 'id1', 'id2']);
  });
+
+ test('can use groupBy without join', () async {
+ final result = await emulateDriftBuild(
+ inputs: {
+ 'a|lib/a.dart': '''
+import 'package:drift/drift.dart';
+
+abstract class Users extends Table {
+ IntColumn get id => integer().autoIncrement()();
+ TextColumn get name => text()();
+}
+
+abstract class CommonNames extends View {
+ Users get users;
+
+ Expression<int> get amount => users.id.count();
+
+ @override
+ Query as() => select([amount]).from(users)
+ ..groupBy([users.id], having: users.id.isBiggerThanValue(10));
+}
+''',
+ },
+ modularBuild: true,
+ logger: loggerThat(neverEmits(anything)),
+ );
+
+ checkOutputs({
+ 'a|lib/a.drift.dart': decodedMatches(contains(r'''
+ @override
+ i0.Query? get query =>
+ (attachedDatabase.selectOnly(users)..addColumns($columns))
+ ..groupBy([users.id],
+ having: i3.ComparableExpr(users.id).isBiggerThanValue(10));
+'''))
+ }, result.dartOutputs, result.writer);
+ });
 }