feat(collate): only collate if locale is provided

cap-js · Mar 5, 2025 · 1e1d589 · 1e1d589
1 parent dc1b458
commit 1e1d589
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hana/lib/HANAService.js b/hana/lib/HANAService.js
@@ -908,7 +908,7 @@ SELECT ${mixing} FROM JSON_TABLE(SRC.JSON, '$' COLUMNS(${extraction})) AS NEW LE
         localized
           ? c =>
             this.expr(c) +
-            (c.element?.[this.class._localized]
+            (c.element?.[this.class._localized] && this.context.locale
               ? ` COLLATE ${collations[this.context.locale] || collations[this.context.locale.split('_')[0]] || collations['']
               }`
               : '') +

diff --git a/postgres/lib/PostgresService.js b/postgres/lib/PostgresService.js
@@ -348,7 +348,7 @@ GROUP BY k
         localized
           ? c =>
             this.expr(c) +
-            (c.element?.[this.class._localized] ? ` COLLATE "${locale}"` : '') +
+            (c.element?.[this.class._localized] && locale ? ` COLLATE "${locale}"` : '') +
             (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST')
           : c => this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC NULLS LAST' : ' ASC NULLS FIRST'),
       )