fix: remove base table validation for inner where on count columns

SandPod · Oct 10, 2023 · a6a9d84 · a6a9d84
1 parent 278674e
commit a6a9d84
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 36 deletions.
diff --git a/packages/serverpod/lib/src/database/database_query.dart b/packages/serverpod/lib/src/database/database_query.dart
@@ -515,22 +515,6 @@ void _validateTableReferences(
             .add('"orderBy" expression referencing column $column.');
       }
     }
-
-    var innerWhereColumns = orderBy.expand<Column>((order) {
-      var column = order.column;
-      if (column is! ColumnCount) {
-        return [];
-      }
-
-      return column.innerWhere?.columns ?? [];
-    });
-
-    for (var column in innerWhereColumns) {
-      if (!column.hasBaseTable(tableName)) {
-        exceptionMessages
-            .add('"orderBy" expression referencing column $column.');
-      }
-    }
   }
 
   if (where != null) {

diff --git a/packages/serverpod/test/database/database_query_test.dart b/packages/serverpod/test/database/database_query_test.dart
@@ -364,26 +364,7 @@ void main() {
     });
 
     test(
-        'when inner where for order by has different table as base then exception is thrown.',
-        () {
-      var queryBuilder = SelectQueryBuilder(table: citizenTable).withOrderBy([
-        Order(
-            column: ColumnCount(
-                companyTable.id.equals(5), citizenTable, citizenTable.id))
-      ]);
-
-      expect(
-          () => queryBuilder.build(),
-          throwsA(isA<FormatException>().having(
-            (e) => e.toString(),
-            'message',
-            equals(
-                'FormatException: Column references starting from other tables than "citizen" are not supported. The following expressions need to be removed or modified:\n"orderBy" expression referencing column "company"."id".'),
-          )));
-    });
-
-    test(
-        'when count column is used in where expression then exception is thrown.',
+        'when  count column is used in where expression then exception is thrown.',
         () {
       var countColumn =
           ColumnCount(citizenTable.id.equals(5), citizenTable, citizenTable.id);