@cap-js/postgres 1.8.0 → 1.10.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.10.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.9.1...postgres-v1.10.0) (2024-07-25)
+
+
+### Changed
+
+* build script generates cds8 dependency in deployer app ([#758](https://github.com/cap-js/cds-dbs/issues/758)) ([5c21a67](https://github.com/cap-js/cds-dbs/commit/5c21a6758ccc927cde857e98145c3f4393deb739))
+
+## [1.9.1](https://github.com/cap-js/cds-dbs/compare/postgres-v1.9.0...postgres-v1.9.1) (2024-07-09)
+
+
+### Fixed
+
+* expand reach of `cds.features.ieee754compatible` to `int64` ([#722](https://github.com/cap-js/cds-dbs/issues/722)) ([7eef5e9](https://github.com/cap-js/cds-dbs/commit/7eef5e9c5ec286285b2552abd1e673175c59fdc1))
+
+## [1.9.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.8.0...postgres-v1.9.0) (2024-05-29)
+
+
+### Added
+
+* Add simple queries feature flag ([#660](https://github.com/cap-js/cds-dbs/issues/660)) ([3335202](https://github.com/cap-js/cds-dbs/commit/33352024201a96cc6bdfa30a0fe3fff4227dee10))
+
 ## [1.8.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.7.0...postgres-v1.8.0) (2024-05-08)
 
 

package/README.md

@@ -1,10 +1,10 @@
 # CDS database service for Postgres
 
-Welcome to the new Postgres database service for [SAP Cloud Application Programming Model](https://cap.cloud.sap) Node.js, based on new, streamlined database architecture and [*pg* driver](https://www.npmjs.com/package/pg) .
+Welcome to the PostgreSQL database service for [SAP Cloud Application Programming Model](https://cap.cloud.sap) Node.js, based on streamlined database architecture and [*pg* driver](https://www.npmjs.com/package/pg) .
 
 ## Setup
 
-In general, all you need to do is to install one of the database packages, as follows:
+In general, all you need to do is to install the database package, as follows:
 
 ```sh
 npm add @cap-js/postgres
@@ -38,7 +38,7 @@ Copyright 2023 SAP SE or an SAP affiliate company and cds-dbs contributors. Plea
 `@cap-js/postgres` works as a drop-in replacement for `cds-pg`.  
 However, some preliminary checks and cleanups help:
 
-- for using the BTP Postgres Hyperscaler as database, 
+- for using the BTP Postgres Hyperscaler as database,
   - know that the credentials are picked up automatically by from the enviornment (`VCAP_SERVICES.postgres`)
   - the service binding label is `postgresql-db`
   - `cds-dbm` is replaced by a hand-crafted "db-deployer" app → see below
@@ -47,7 +47,7 @@ However, some preliminary checks and cleanups help:
 
 ### schema migration
 
-`@cap-js/postgres` brings the same schema evolution capabilities to PostgreSQL known from HANA and SQLite.  
+`@cap-js/postgres` brings the same schema evolution capabilities to PostgreSQL known from SAP HANA and SQLite.  
 Enabling schema migration in an existing `cds-pg`-based project consists of generating and deploying a "csn-snapshot" of your database structure.
 
 #### local development
@@ -134,11 +134,11 @@ now, re-use the CDS definitions: `SELECT.from(Beers).columns('brewery_ID').group
 
 So please adjust your `CQL` statements accordingly.
 
-### timezones (potential _**BREAKING CHANGE**_)
+### timezones (potential **BREAKING CHANGE**)
 
 any date- + time-type will get stored in [`UTC`](https://en.wikipedia.org/wiki/Coordinated_Universal_Time) **without any timezone identifier in the actual data field**.  
 CAP's inbound- and outbound adapters take care of converting incoming and outgoing data from/to the desired time zones.  
-So when a `dateime` comes in being in [an ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) compatible format  
+So when a `datetime` comes in being in [an ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) compatible format  
   `2009-01-01T15:00:00+01:00` (15:00:00 on January 1 2009 in Vienna (CEST))  
 will get stored as  
   `2009-01-01T13:00:00` (13:00:00 on January 1 2009 in UTC).

package/cds-plugin.js

@@ -27,7 +27,7 @@ cds.build?.register?.('postgres', class PostgresBuildPlugin extends cds.build.Pl
     } else {
       promises.push(
         this.write({
-          dependencies: { '@sap/cds': '^7', '@cap-js/postgres': '^1' },
+          dependencies: { '@sap/cds': '^8', '@cap-js/postgres': '^1' },
           scripts: { start: 'cds-deploy' },
         }).to('package.json'),
       )

package/lib/PostgresService.js

@@ -1,6 +1,6 @@
 const { SQLService } = require('@cap-js/db-service')
 const { Client, Query } = require('pg')
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const crypto = require('crypto')
 const { Writable, Readable } = require('stream')
 const sessionVariableMap = require('./session.json')
@@ -370,7 +370,8 @@ GROUP BY k
       return super.column_alias4(x, q)
     }
 
-    SELECT_expand({ SELECT }, sql) {
+    SELECT_expand(q, sql) {
+      const { SELECT } = q
       if (!SELECT.columns) return sql
       const queryAlias = this.quote(SELECT.from?.as || (SELECT.expand === 'root' && 'root'))
       const cols = SELECT.columns.map(x => {
@@ -385,10 +386,22 @@ GROUP BY k
         }
         return col
       })
+      const isRoot = SELECT.expand === 'root'
+      const isSimple = cds.env.features.sql_simple_queries &&
+        isRoot && // Simple queries are only allowed to have a root
+        !Object.keys(q.elements).some(e =>
+          q.elements[e].isAssociation || // Indicates columns contains an expand
+          q.elements[e].$assocExpand || // REVISIT: sometimes associations are structs
+          q.elements[e].items // Array types require to be inlined with a json result
+        )
+
+      const subQuery = `SELECT ${cols} FROM (${sql}) as ${queryAlias}`
+      if (isSimple) return subQuery
+
       // REVISIT: Remove SELECT ${cols} by adjusting SELECT_columns
       let obj = `to_jsonb(${queryAlias}.*)`
-      return `SELECT ${SELECT.one || SELECT.expand === 'root' ? obj : `coalesce(jsonb_agg (${obj}),'[]'::jsonb)`
-        } as _json_ FROM (SELECT ${cols} FROM (${sql}) as ${queryAlias}) as ${queryAlias}`
+      return `SELECT ${SELECT.one || isRoot ? obj : `coalesce(jsonb_agg (${obj}),'[]'::jsonb)`
+        } as _json_ FROM (${subQuery}) as ${queryAlias}`
     }
 
     doubleQuote(name) {
@@ -516,10 +529,10 @@ GROUP BY k
       struct: e => `jsonb(${e})`,
       array: e => `jsonb(${e})`,
       // Reading int64 as string to not loose precision
-      Int64: expr => `cast(${expr} as varchar)`,
+      Int64: cds.env.features.ieee754compatible ? expr => `cast(${expr} as varchar)` : undefined,
       // REVISIT: always cast to string in next major
       // Reading decimal as string to not loose precision
-      Decimal: cds.env.features.string_decimals ? expr => `cast(${expr} as varchar)` : undefined,
+      Decimal: cds.env.features.ieee754compatible ? expr => `cast(${expr} as varchar)` : undefined,
 
       // Convert point back to json format
       'cds.hana.ST_POINT': expr => `CASE WHEN (${expr}) IS NOT NULL THEN json_object('x':(${expr})[0],'y':(${expr})[1])::varchar END`,
@@ -553,7 +566,7 @@ GROUP BY k
         GRANT "${creds.usergroup}" TO "${creds.user}" WITH ADMIN OPTION;
       `)
       await this.exec(`CREATE DATABASE "${creds.database}" OWNER="${creds.user}" TEMPLATE=template0`)
-    } catch (e) {
+    } catch {
       // Failed to reset database
     } finally {
       await this.dbc.end()

package/lib/cql-functions.js

@@ -9,8 +9,8 @@ const StandardFunctions = {
   count: x => `count(${x?.val || x || '*'})`,
   countdistinct: x => `count(distinct ${x.val || x || '*'})`,
   contains: (...args) => `(coalesce(strpos(${args}),0) > 0)`,
-  indexof: (x, y) => `strpos(${x},${y}) - 1`, // sqlite instr is 1 indexed
-  startswith: (x, y) => `strpos(${x},${y}) = 1`, // sqlite instr is 1 indexed
+  indexof: (x, y) => `strpos(${x},${y}) - 1`, // strpos is 1 indexed
+  startswith: (x, y) => `strpos(${x},${y}) = 1`, // strpos is 1 indexed
   endswith: (x, y) => `substr(${x},length(${x}) + 1 - length(${y})) = ${y}`,
   matchesPattern: (x, y) => `regexp_like(${x}, ${y})`,
   matchespattern: (x, y) => `regexp_like(${x}, ${y})`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {
@@ -22,10 +22,6 @@
     "lib",
     "CHANGELOG.md"
   ],
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8"
-  },
   "scripts": {
     "test": "npm start && jest --silent",
     "start": "docker-compose -f pg-stack.yml up -d"