Merge branch 'main' into sqlite-compliance-tests

Author: patricebender

.github/workflows/conventional-commits.yml

@@ -25,6 +25,7 @@ jobs:
           types: |
             feat
             fix
+            changed
             docs
             style
             refactor

CONTRIBUTING.md

@@ -56,8 +56,9 @@ The prefix is used to calculate the semver release level, and the section of the
 | **type**   | When to Use                          | Release Level | Release Note Section  |
 | ---------- | ----------------------------------- | ------------- | --------------------   |
 | feat       | A feature has been added            | `minor`       | **Added**           |
+| changed     | Changes to the dependencies     | `minor`       | **Changed**          |
 | fix        | A bug has been patched              | `patch`       | **Fixed**          |
-| deps        | Changes to the dependencies          | `patch`       | **Changed**          |
+| deps        | Changes to the dependencies        | `patch`       | **Changed**          |
 | perf       | Performance improvements            | none          | **Performance Improvements**   |
 | chore      | Any changes that aren't user-facing | none          | none                   |
 | docs       | Documentation updates               | none          | none                   |

db-service/lib/SQLService.js

@@ -57,24 +57,18 @@ class SQLService extends DatabaseService {
     return super.init()
   }
 
-  _changeToStreams(columns, rows, one, compat) {
+  _changeToStreams(columns, rows, one) {
     if (!rows || !columns) return
     if (!Array.isArray(rows)) rows = [rows]
-    if (!rows.length || !Object.keys(rows[0]).length) return
-
-    // REVISIT: remove after removing stream_compat feature flag
-    if (compat) {
-      rows[0][Object.keys(rows[0])[0]] = this._stream(Object.values(rows[0])[0])
-      return
-    }
+    if (!rows.length || !Object.keys(rows[0]).length) return   
 
     let changes = false
     for (let col of columns) {
       const name = col.as || col.ref?.[col.ref.length - 1] || (typeof col === 'string' && col)
       if (col.element?.isAssociation) {
-        if (one) this._changeToStreams(col.SELECT.columns, rows[0][name], false, compat)
+        if (one) this._changeToStreams(col.SELECT.columns, rows[0][name], false)
         else
-          changes = rows.some(row => !this._changeToStreams(col.SELECT.columns, row[name], false, compat))
+          changes = rows.some(row => !this._changeToStreams(col.SELECT.columns, row[name], false))
       } else if (col.element?.type === 'cds.LargeBinary') {
         changes = true
         if (one) rows[0][name] = this._stream(rows[0][name])
@@ -141,23 +135,7 @@ class SQLService extends DatabaseService {
         if (expand) rows = rows.map(r => (typeof r._json_ === 'string' ? JSON.parse(r._json_) : r._json_ || r))
 
       if (!iterator) {
-        // REVISIT: remove after removing stream_compat feature flag
-        if (cds.env.features.stream_compat) {
-          if (query._streaming) {
-            if (!rows.length) return
-            this._changeToStreams(cqn.SELECT.columns, rows, true, true)
-            const result = rows[0]
-
-            // stream is always on position 0. Further properties like etag are inserted later.
-            let [key, val] = Object.entries(result)[0]
-            result.value = val
-            delete result[key]
-
-            return result
-          }
-        } else {
-          this._changeToStreams(cqn.SELECT.columns, rows, query.SELECT.one, false)
-        }
+         this._changeToStreams(cqn.SELECT.columns, rows, query.SELECT.one)
       } else if (objectMode) {
         const converter = (row) => this._changeToStreams(cqn.SELECT.columns, row, true)
         const changeToStreams = new Transform({

postgres/test/service-types.test.js

@@ -2,8 +2,6 @@ const { resolve } = require('path')
 const cds = require('../../test/cds.js')
 if (cds.env.fiori) cds.env.fiori.lean_draft = true
 else cds.env.features.lean_draft = true
-// REVISIT: remove after streaming PR is merged in cds
-cds.env.features.stream_compat = true
 
 const project = resolve(__dirname, 'beershop')
 

postgres/test/streaming.compat.test.js

@@ -25,6 +25,11 @@
       "type": "perf",
       "section": "Performance Improvements",
       "hidden": false
+    },
+    {
+      "type": "changed",
+      "section": "Changed",
+      "hidden": false
     }
   ]
 }