@cap-js/postgres 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.3](https://github.com/cap-js/cds-dbs/compare/postgres-v2.0.2...postgres-v2.0.3) (2025-06-30)
+
+
+### Fixed
+
+* **`cds-build`:** retain more build relevant options in the deployer app ([#1206](https://github.com/cap-js/cds-dbs/issues/1206)) ([e7ed70f](https://github.com/cap-js/cds-dbs/commit/e7ed70f36920867ec0063d29255e3681dec1b60c))
+
+## [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)
 
 

package/cds-plugin.js

@@ -5,19 +5,22 @@ if (!cds.env.fiori.lean_draft) {
   throw new Error('"@cap-js/postgres" only works if cds.fiori.lean_draft is enabled. Please adapt your configuration.')
 }
 
+// copy over build relevant cds options to the package.json of the deployer app
+const CDS_BUILD_OPTIONS = ['assert_integrity']
+
+// cdsc options are build relevant too, but we need to filter out some
+const CDSC_DISALLOW   = ['moduleLookupDirectories']
+
 // requires @sap/cds-dk version >= 7.5.0
 cds.build?.register?.('postgres', class PostgresBuildPlugin extends cds.build.Plugin {
-  
   static taskDefaults = { src: cds.env.folders.db }
-  
-  static hasTask() { return cds.requires.db?.kind === 'postgres' }
-
-  init() {
+  static hasTask () { return cds.requires.db?.kind === 'postgres' }
+  init () {
     // different from the default build output structure
     this.task.dest = path.join(cds.root, cds.env.build.target !== '.' ? cds.env.build.target : 'gen', 'pg')
   }
 
-  async build() {
+  async build () {
     const model = await this.model()
     if (!model) return
 
@@ -27,23 +30,36 @@ cds.build?.register?.('postgres', class PostgresBuildPlugin extends cds.build.Pl
     } else {
       const packageJson = {
         dependencies: {
-          '@sap/cds': '^8',
-          '@cap-js/postgres': '^1'
+          '@sap/cds': '^9',
+          '@cap-js/postgres': '^2'
         },
-        scripts: {
-          start: 'cds-deploy'
+        scripts: { start: 'cds-deploy' }
+      }
+
+      // propagate cds.env.features (allow-listed)
+      const envFeatures = cds.env?.features ?? {}
+      for (const name of CDS_BUILD_OPTIONS) {
+        const val = envFeatures[name]
+        if (val !== undefined) {
+          packageJson.cds ??= {}
+          packageJson.cds.features ??= {}
+          packageJson.cds.features[name] = val
         }
       }
-      const assertIntegrity = cds.env?.features?.assert_integrity
-      if (assertIntegrity) {
+
+      // propagate cds.env.cdsc (minus disallowed)
+      const envCdsc = cds.env?.cdsc ?? {}
+      const cdscClean = Object.fromEntries(
+        Object.entries(envCdsc).filter(([key]) => !CDSC_DISALLOW.includes(key))
+      )
+      if (Object.keys(cdscClean).length) {
         packageJson.cds ??= {}
-        packageJson.cds.features ??= {}
-        packageJson.cds.features.assert_integrity = assertIntegrity
+        packageJson.cds.cdsc = cdscClean
       }
-      promises.push(        
-        this.write(packageJson).to('package.json')
-      )
+
+      promises.push(this.write(packageJson).to('package.json'))
     }
+
     promises.push(this.write(cds.compile.to.json(model)).to(path.join('db', 'csn.json')))
 
     let data

package/lib/PostgresService.js

@@ -48,8 +48,10 @@ class PostgresService extends SQLService {
               ca: cr.sslrootcert,
             }),
         }
-        const dbc = new Client({...credentials, ...clientOptions})
+        const dbc = new Client({ ...credentials, ...clientOptions })
         await dbc.connect()
+        dbc.open = true
+        dbc.on('end', () => { dbc.open = false })
         return dbc
       },
       destroy: dbc => dbc.end(),
@@ -283,7 +285,7 @@ GROUP BY k
         return target && this.run(cds.ql.CREATE(target))
       }
     }
-    
+
     try {
       return await super.onPlainSQL(req, next)
     }
@@ -367,8 +369,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')
       })
@@ -379,7 +381,7 @@ GROUP BY k
     }
 
     orderByICU(orderBy, localized) {
-      const locale = this.context.locale  ? `${this.context.locale.replace('_', '-')}-x-icu` : this.context.locale
+      const locale = this.context.locale ? `${this.context.locale.replace('_', '-')}-x-icu` : this.context.locale
       return this._orderBy(orderBy, localized, locale)
     }
 
@@ -710,14 +712,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.1",
+  "version": "2.0.3",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {