fix(postgres): fix pagination with order by UUID PK

Closes #2910
mikro-orm · Mar 14, 2022 · 042626c · 042626c
1 parent eba497d
commit 042626c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/packages/core/src/platforms/Platform.ts b/packages/core/src/platforms/Platform.ts
@@ -410,4 +410,11 @@ export abstract class Platform {
     throw new Error('Not supported');
   }
 
+  /**
+   * @internal
+   */
+  castColumn(prop?: EntityProperty): string {
+    return '';
+  }
+
 }
diff --git a/packages/knex/src/query/QueryBuilder.ts b/packages/knex/src/query/QueryBuilder.ts
@@ -862,8 +862,11 @@ export class QueryBuilder<T extends AnyEntity<T> = AnyEntity> {
       const orderBy = [];
       for (const orderMap of this._orderBy) {
         for (const [field, direction] of Object.entries(orderMap)) {
+          const [a, f] = this.helper.splitField(field);
+          const prop = this.helper.getProperty(f, a);
+          const type = this.platform.castColumn(prop);
           orderBy.push({
-            [`min(${this.ref(this.helper.mapper(field, this.type))})`]: direction,
+            [`min(${this.ref(this.helper.mapper(field, this.type))}${type})`]: direction,
           });
         }
       }

diff --git a/packages/postgresql/src/PostgreSqlPlatform.ts b/packages/postgresql/src/PostgreSqlPlatform.ts
@@ -221,4 +221,15 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
     return indexName;
   }
 
+  /**
+   * @inheritDoc
+   */
+  castColumn(prop?: EntityProperty): string {
+    if (prop?.columnTypes?.[0] === this.getUuidTypeDeclarationSQL({})) {
+      return '::text';
+    }
+
+    return '';
+  }
+
 }
diff --git a/tests/features/paginate-flag.postgres.test.ts b/tests/features/paginate-flag.postgres.test.ts
@@ -2,6 +2,7 @@
 
 import { Collection, Entity, Enum, Filter, ManyToMany, ManyToOne, MikroORM, OneToMany, OneToOne, PrimaryKey, Property } from '@mikro-orm/core';
 import type { PostgreSqlDriver } from '@mikro-orm/postgresql';
+import { v4 } from 'uuid';
 
 @Entity()
 export class Group {
@@ -85,8 +86,8 @@ export class C {
 @Entity()
 export class T {
 
-  @PrimaryKey()
-  id!: number;
+  @PrimaryKey({ type: 'uuid' })
+  id: string = v4();
 
   @Property()
   end!: Date;
@@ -106,8 +107,8 @@ export class T {
 @Entity()
 export class TC {
 
-  @PrimaryKey()
-  id!: number;
+  @PrimaryKey({ type: 'uuid' })
+  id: string = v4();
 
   @ManyToOne(() => C, { nullable: true })
   c?: C;
@@ -252,6 +253,9 @@ describe('GH issue 2095', () => {
     expect(firstResults.length).toBe(20);
     expect(secondResults.length).toBe(20);
     expect(firstMaxDate.getTime()).toBeLessThan(secondMinDate.getTime());
+
+    // this requires casting of the UUID column to use it in `min()` (GH #2910)
+    await orm.em.fork().find(T, {}, { orderBy: { tc: { id: 'desc' } }, limit: 5 });
   });
 
   test('getting users with limit 3. must be: [id-user-03, id-user-02, id-user-01]', async () => {