@cap-js/postgres 1.12.0 → 1.14.0

package/CHANGELOG.md

@@ -4,6 +4,27 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.14.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.13.0...postgres-v1.14.0) (2025-04-17)
+
+
+### Added
+
+* Result set streaming ([#702](https://github.com/cap-js/cds-dbs/issues/702)) ([2fe02ea](https://github.com/cap-js/cds-dbs/commit/2fe02eafd02993e5697efbdab90ad997fb2c9e00))
+
+## [1.13.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.12.0...postgres-v1.13.0) (2025-03-31)
+
+
+### Added
+
+* **collate:** only collate if locale is provided ([#1060](https://github.com/cap-js/cds-dbs/issues/1060)) ([dedd768](https://github.com/cap-js/cds-dbs/commit/dedd768c085aa29be0e38db11f11678ff55d5b7b))
+* **forUpdate:** ignore locked ([#1074](https://github.com/cap-js/cds-dbs/issues/1074)) ([163480b](https://github.com/cap-js/cds-dbs/commit/163480b245b18a2829cd871c2f053c82bcc1abef))
+
+
+### Fixed
+
+* consider `nulls first | last` on `orderBy` ([#1064](https://github.com/cap-js/cds-dbs/issues/1064)) ([c6bed60](https://github.com/cap-js/cds-dbs/commit/c6bed60f0d93b9f4a73c976727f30172707c60d9)), closes [#1062](https://github.com/cap-js/cds-dbs/issues/1062)
+* Persist assert_integrity feature ([#1032](https://github.com/cap-js/cds-dbs/issues/1032)) ([2956279](https://github.com/cap-js/cds-dbs/commit/2956279777ac94330c98373d8bca32cf0f8e967e))
+
 ## [1.12.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.11.1...postgres-v1.12.0) (2025-03-04)
 
 

package/cds-plugin.js

@@ -25,11 +25,23 @@ cds.build?.register?.('postgres', class PostgresBuildPlugin extends cds.build.Pl
     if (fs.existsSync(path.join(this.task.src, 'package.json'))) {
       promises.push(this.copy(path.join(this.task.src, 'package.json')).to('package.json'))
     } else {
-      promises.push(
-        this.write({
-          dependencies: { '@sap/cds': '^8', '@cap-js/postgres': '^1' },
-          scripts: { start: 'cds-deploy' },
-        }).to('package.json'),
+      const packageJson = {
+        dependencies: {
+          '@sap/cds': '^8',
+          '@cap-js/postgres': '^1'
+        },
+        scripts: {
+          start: 'cds-deploy'
+        }
+      }
+      const assertIntegrity = cds.env?.features?.assert_integrity
+      if (assertIntegrity) {
+        packageJson.cds ??= {}
+        packageJson.cds.features ??= {}
+        packageJson.cds.features.assert_integrity = assertIntegrity
+      }
+      promises.push(        
+        this.write(packageJson).to('package.json')
       )
     }
     promises.push(this.write(cds.compile.to.json(model)).to(path.join('db', 'csn.json')))

package/lib/PostgresService.js

@@ -178,9 +178,9 @@ GROUP BY k
           throw enhanceError(e, sql)
         }
       },
-      stream: async (values, one) => {
+      stream: async (values, one, objectMode) => {
         try {
-          const streamQuery = new QueryStream({ ...query, values: this._getValues(values) }, one)
+          const streamQuery = new QueryStream({ ...query, values: this._getValues(values) }, one, objectMode)
           return await this.dbc.query(streamQuery)
         } catch (e) {
           throw enhanceError(e, sql)
@@ -305,7 +305,8 @@ GROUP BY k
     }
   }
 
-  async onSELECT({ query, data }) {
+  async onSELECT(req) {
+    const { query, data } = req
     // workaround for chunking odata streaming
     if (query.SELECT?.columns?.find(col => col.as === '$mediaContentType')) {
       const columns = query.SELECT.columns
@@ -323,7 +324,7 @@ GROUP BY k
       res[this.class.CQN2SQL.prototype.column_name(binary[0])] = stream
       return res
     }
-    return super.onSELECT({ query, data })
+    return super.onSELECT(req)
   }
 
   async onINSERT(req) {
@@ -344,14 +345,15 @@ GROUP BY k
 
   static CQN2SQL = class CQN2Postgres extends SQLService.CQN2SQL {
     _orderBy(orderBy, localized, locale) {
-      return orderBy.map(
-        localized
-          ? c =>
-            this.expr(c) +
-            (c.element?.[this.class._localized] ? ` 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'),
-      )
+      return orderBy.map(c => {
+        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')
+          : this.expr(c) + (c.sort?.toLowerCase() === 'desc' || c.sort === -1 ? ' DESC' : ' ASC')
+        return o + ' NULLS ' + (nulls.toLowerCase() === 'first' ? 'FIRST' : 'LAST')
+      })
     }
 
     orderBy(orderBy) {
@@ -465,9 +467,11 @@ GROUP BY k
     // Postgres does not support locking columns only tables which makes of unapplicable
     // Postgres does not support "wait n" it only supports "nowait"
     forUpdate(update) {
-      const { wait } = update
-      if (wait === 0) return 'FOR UPDATE NOWAIT'
-      return 'FOR UPDATE'
+      const { wait, ignoreLocked } = update
+      let sql = 'FOR UPDATE'
+      if (wait === 0) sql += ' NOWAIT'
+      if (ignoreLocked) sql += ' SKIP LOCKED'
+      return sql
     }
 
     forShareLock(lock) {
@@ -571,7 +575,6 @@ GROUP BY k
 
       // Convert ST types back to WKT format
       'cds.hana.ST_POINT': expr => `ST_AsText(${expr})`,
-      'cds.hana.ST_POINT': expr => `ST_AsText(${expr})`,
     }
   }
 
@@ -664,7 +667,7 @@ GROUP BY k
 }
 
 class QueryStream extends Query {
-  constructor(config, one) {
+  constructor(config, one, objectMode) {
     // REVISIT: currently when setting the row chunk size
     // it results in an inconsistent connection state
     // if (!one) config.rows = 1000
@@ -673,6 +676,7 @@ class QueryStream extends Query {
     this._one = one || config.one
 
     this.stream = new Readable({
+      objectMode,
       read: this.rows
         ? () => {
           this.stream.pause()
@@ -690,7 +694,7 @@ class QueryStream extends Query {
     this._prom = new Promise((resolve, reject) => {
       this.once('error', reject)
       this.once('end', () => {
-        if (!this._one) this.push(this.constructor.close)
+        if (!objectMode && !this._one) this.push(this.constructor.close)
         this.push(null)
         if (this.stream.isPaused()) this.stream.resume()
         resolve(null)
@@ -733,10 +737,15 @@ class QueryStream extends Query {
     } else {
       this.handleDataRow = msg => {
         const val = msg.fields[0]
-        if (!this._one && val !== null) this.push(this.constructor.open)
+        const objectMode = this.stream.readableObjectMode
+        if (!objectMode && !this._one && val !== null) this.push(this.constructor.open)
         this.emit('row', val)
-        this.push(val)
+        this.push(objectMode ? JSON.parse(val) : val)
+
         delete this.handleDataRow
+        if (objectMode) {
+          this.handleDataRow = this.handleDataRowObjectMode
+        }
       }
     }
     return super.handleRowDescription(msg)
@@ -748,6 +757,11 @@ class QueryStream extends Query {
     this.push(msg.fields[0])
   }
 
+  // Called when a new row is received
+  handleDataRowObjectMode(msg) {
+    this.push(JSON.parse(msg.fields[0]))
+  }
+
   // Called when a new binary row is received
   handleBinaryRow(msg) {
     const val = msg.fields[0] === null ? null : this._result._parsers[0](msg.fields[0])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {
@@ -27,7 +27,7 @@
     "start": "docker compose -f pg-stack.yml up -d"
   },
   "dependencies": {
-    "@cap-js/db-service": "^1.18.0",
+    "@cap-js/db-service": "^1.20.0",
     "pg": "^8"
   },
   "peerDependencies": {