@cap-js/postgres 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -4,6 +4,33 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.2](https://github.com/cap-js/cds-dbs/compare/postgres-v2.0.1...postgres-v2.0.2) (2025-06-04)
+
+
+### Fixed
+
+* Allow raw streams to have empty results ([#1224](https://github.com/cap-js/cds-dbs/issues/1224)) ([0a59e69](https://github.com/cap-js/cds-dbs/commit/0a59e69eae2f701b5c475512fd1cd83cfb586153))
+
+## [2.0.1](https://github.com/cap-js/cds-dbs/compare/postgres-v2.0.0...postgres-v2.0.1) (2025-05-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove PG `?` placeholder replacement ([#1180](https://github.com/cap-js/cds-dbs/issues/1180))
+
+
+### Fixed
+
+* Enable mixing stream and normal parameters in queries ([#1179](https://github.com/cap-js/cds-dbs/issues/1179)) ([7ee8083](https://github.com/cap-js/cds-dbs/commit/7ee808365426072250dd6de87abd11215f44561a))
+* hierarchies in quoted mode ([3465cba](https://github.com/cap-js/cds-dbs/commit/3465cbab579d4560d12d3b230c55b746d4d3f5a5))
+* only sort by locale if locale is set ([#1193](https://github.com/cap-js/cds-dbs/issues/1193)) ([3465cba](https://github.com/cap-js/cds-dbs/commit/3465cbab579d4560d12d3b230c55b746d4d3f5a5))
+
+
+### Changed
+
+* remove PG `?` placeholder replacement ([#1180](https://github.com/cap-js/cds-dbs/issues/1180)) ([a1e0bd9](https://github.com/cap-js/cds-dbs/commit/a1e0bd9fe8501c284d8cbfc8d79d4dddda34c087))
+* remove stream_compat ([#1139](https://github.com/cap-js/cds-dbs/issues/1139)) ([#1144](https://github.com/cap-js/cds-dbs/issues/1144)) ([1b8b2d9](https://github.com/cap-js/cds-dbs/commit/1b8b2d9539cd97be2cef088c98d88ef9ec7dd1bf))
+
 ## [2.0.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.14.0...postgres-v2.0.0) (2025-05-07)
 
 

package/lib/PostgresService.js

@@ -48,7 +48,7 @@ class PostgresService extends SQLService {
               ca: cr.sslrootcert,
             }),
         }
-        const dbc = new Client({...credentials, ...clientOptions})
+        const dbc = new Client({ ...credentials, ...clientOptions })
         await dbc.connect()
         return dbc
       },
@@ -212,7 +212,7 @@ GROUP BY k
           if (isBinary) value.setEncoding('base64')
           value.pipe(paramStream)
           value.on('error', err => paramStream.emit('error', err))
-          streams[i] = paramStream
+          streams.push(paramStream)
           newValues[i] = streamID
           sql = sql.replace(
             new RegExp(`\\$${i + 1}`, 'g'),
@@ -283,12 +283,7 @@ GROUP BY k
         return target && this.run(cds.ql.CREATE(target))
       }
     }
-    // Look for ? placeholders outside of string and replace them with $n
-    if (/('|")(\1|[^\1]*?\1)|(\?)/.exec(query)?.[3]) {
-      let i = 1
-      // eslint-disable-next-line no-unused-vars
-      req.query = query.replace(/('|")(\1|[^\1]*?\1)|(\?)/g, (a, _b, _c, d, _e, _f, _g) => (d ? '$' + i++ : a))
-    }
+    
     try {
       return await super.onPlainSQL(req, next)
     }
@@ -372,8 +367,8 @@ GROUP BY k
         const nulls = c.nulls || (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? 'LAST' : 'FIRST')
         const o = localized
           ? this.expr(c) +
-            (c.element?.[this.class._localized] && locale ? ` COLLATE "${locale}"` : '') +
-            (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
+          (c.element?.[this.class._localized] && locale ? ` COLLATE "${locale}"` : '') +
+          (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
           : this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
         return o + ' NULLS ' + (nulls.toLowerCase() === 'first' ? 'FIRST' : 'LAST')
       })
@@ -384,7 +379,7 @@ GROUP BY k
     }
 
     orderByICU(orderBy, localized) {
-      const locale = `${this.context.locale.replace('_', '-')}-x-icu`
+      const locale = this.context.locale  ? `${this.context.locale.replace('_', '-')}-x-icu` : this.context.locale
       return this._orderBy(orderBy, localized, locale)
     }
 
@@ -715,14 +710,19 @@ class QueryStream extends Query {
     this.push = this.stream.push.bind(this.stream)
 
     this._prom = new Promise((resolve, reject) => {
+      let hasData = false
       this.once('error', reject)
       this.once('end', () => {
-        if (!objectMode && !this._one) this.push(this.constructor.close)
+        if (!objectMode && !this._one) {
+          if (!hasData) this.push(this.constructor.open)
+          this.push(this.constructor.close)
+        }
         this.push(null)
         if (this.stream.isPaused()) this.stream.resume()
-        resolve(null)
+        resolve(this._one ? null : this.stream)
       })
       this.once('row', row => {
+        hasData = true
         if (row == null) return resolve(null)
         resolve(this.stream)
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {