⚡ asc nulls last in order by (#270)

subsquid · May 1, 2024 · 3dab2c4 · 3dab2c4
1 parent dc48545
commit 3dab2c4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/common/changes/@subsquid/graphql-server/patch-1_2024-04-26-11-29.json b/common/changes/@subsquid/graphql-server/patch-1_2024-04-26-11-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/graphql-server",
+      "comment": "add ASC_NULLS_LAST and DESC_NULLS_FIRST for graphql sorting",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/graphql-server"
+}
diff --git a/common/changes/@subsquid/openreader/patch-1_2024-04-26-11-29.json b/common/changes/@subsquid/openreader/patch-1_2024-04-26-11-29.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@subsquid/openreader",
+      "comment": "add ASC_NULLS_LAST and DESC_NULLS_FIRST for graphql sorting",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@subsquid/openreader"
+}
diff --git a/common/changes/@subsquid/ss58-codec/master_2024-04-09-00-25.json b/common/changes/@subsquid/ss58-codec/master_2024-04-09-00-25.json
diff --git a/graphql/openreader/src/ir/args.ts b/graphql/openreader/src/ir/args.ts
@@ -82,4 +82,4 @@ export interface OrderBy {
 }
 
 
-export type SortOrder = 'ASC' | 'DESC' | 'ASC NULLS FIRST' | 'DESC NULLS LAST'
+export type SortOrder = 'ASC' | 'DESC' | 'ASC NULLS FIRST' | 'ASC NULLS LAST' | 'DESC NULLS FIRST' | 'DESC NULLS LAST'
diff --git a/graphql/openreader/src/opencrud/orderBy.ts b/graphql/openreader/src/opencrud/orderBy.ts
@@ -43,8 +43,9 @@ function buildOrderByMapping(model: Model, typeName: string, depth: number): Ope
                     m.set(key + '_ASC', { [key]: 'ASC' })
                     m.set(key + '_DESC', { [key]: 'DESC' })
                     m.set(key + '_ASC_NULLS_FIRST', { [key]: 'ASC NULLS FIRST' });
+                    m.set(key + '_ASC_NULLS_LAST', { [key]: 'ASC NULLS LAST' });
+                    m.set(key + '_DESC_NULLS_FIRST', { [key]: 'DESC NULLS FIRST' });
                     m.set(key + '_DESC_NULLS_LAST', { [key]: 'DESC NULLS LAST' });
-
                 }
                 break
             case 'object':
Original file line number	Diff line number	Diff line change
Expand Up		@@ -82,4 +82,4 @@ export interface OrderBy {
		}


		export type SortOrder = 'ASC' \| 'DESC' \| 'ASC NULLS FIRST' \| 'DESC NULLS LAST'
		export type SortOrder = 'ASC' \| 'DESC' \| 'ASC NULLS FIRST' \| 'ASC NULLS LAST' \| 'DESC NULLS FIRST' \| 'DESC NULLS LAST'