@cap-js/postgres 1.10.0 → 1.10.1

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.10.1](https://github.com/cap-js/cds-dbs/compare/postgres-v1.10.0...postgres-v1.10.1) (2024-10-15)
+
+
+### Fixed
+
+* add cds schema for postgres build plugin ([#843](https://github.com/cap-js/cds-dbs/issues/843)) ([6306d5c](https://github.com/cap-js/cds-dbs/commit/6306d5ce50c071b38a3d9f61b0820ea713a782d8))
+* Improved behavioral consistency between the database services ([#837](https://github.com/cap-js/cds-dbs/issues/837)) ([b6f7187](https://github.com/cap-js/cds-dbs/commit/b6f718701e48dfb1c4c3d98ee016ec45930f8e7b))
+* null as default value ([#845](https://github.com/cap-js/cds-dbs/issues/845)) ([0041ec0](https://github.com/cap-js/cds-dbs/commit/0041ec0a26c29b30f91470d93611b29acd837216))
+
 ## [1.10.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.9.1...postgres-v1.10.0) (2024-07-25)
 
 

package/lib/PostgresService.js

@@ -253,7 +253,7 @@ GROUP BY k
     return this.dbc.query(sql)
   }
 
-  onPlainSQL(req, next) {
+  async onPlainSQL(req, next) {
     const query = req.query
     if (this.options.independentDeploy) {
       // REVISIT: Should not be needed when deployment supports all types or sends CQNs
@@ -289,8 +289,19 @@ GROUP BY k
       // 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))
     }
-
-    return super.onPlainSQL(req, next)
+    try {
+      return await super.onPlainSQL(req, next)
+    }
+    catch (err) {
+      if (err.code === '3F000') {
+        if (this.options?.credentials?.schema) {
+          cds.error`Failed to configure schema ("${this.options?.credentials?.schema}") before plainSQL call: ${req.query}`
+        } else {
+          cds.error`No schema was configure / detected before plainSQL call: ${req.query}`
+        }
+      }
+      throw err
+    }
   }
 
   async onSELECT({ query, data }) {
@@ -459,7 +470,7 @@ GROUP BY k
     }
 
     defaultValue(defaultValue = this.context.timestamp.toISOString()) {
-      return this.string(`${defaultValue}`)
+      return typeof defaultValue === 'string' ? this.string(`${defaultValue}`) : defaultValue
     }
 
     static Functions = { ...super.Functions, ...require('./cql-functions') }
@@ -532,7 +543,10 @@ GROUP BY k
       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.ieee754compatible ? expr => `cast(${expr} as varchar)` : undefined,
+      Decimal: cds.env.features.ieee754compatible ? (expr, elem) => elem?.scale
+        ? `to_char(${expr},'FM${'0'.padStart(elem.precision, '9')}${'D'.padEnd(elem.scale + 1, '0')}')`
+        : `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`,
@@ -567,14 +581,21 @@ GROUP BY k
       `)
       await this.exec(`CREATE DATABASE "${creds.database}" OWNER="${creds.user}" TEMPLATE=template0`)
     } catch {
+      // Failed to connect to database
+      if (!this.dbc) {
+        return this.database({ database })
+      }
       // Failed to reset database
     } finally {
-      await this.dbc.end()
-      delete this.dbc
-
-      // Update credentials to new Database owner
-      await this.disconnect()
-      this.options.credentials = Object.assign({}, system, creds)
+      // Only clean when successfully connected
+      if (this.dbc) {
+        await this.dbc.end()
+        delete this.dbc
+
+        // Update credentials to new Database owner
+        await this.disconnect()
+        this.options.credentials = Object.assign({}, system, creds)
+      }
     }
   }
 
@@ -589,18 +610,20 @@ GROUP BY k
 
     try {
       if (!clean) {
-        await this.tx(async tx => {
-          // await tx.run(`DROP USER IF EXISTS "${creds.user}"`)
-          await tx
-            .run(`CREATE USER "${creds.user}" IN GROUP "${creds.usergroup}" PASSWORD '${creds.password}'`)
-            .catch(e => {
-              if (e.code === '42710') return
-              throw e
-            })
-        })
-        await this.tx(async tx => {
-          await tx.run(`GRANT CREATE, CONNECT ON DATABASE "${creds.database}" TO "${creds.user}";`)
-        })
+        await cds
+          .run(`CREATE USER "${creds.user}" IN GROUP "${creds.usergroup}" PASSWORD '${creds.password}'`)
+          .catch(e => {
+            if (e.code === '42710') return
+            throw e
+          })
+        // Retry granting priviledges as this is being done by multiple instances
+        // Postgres just rejects when other connections are granting the same user
+        const grant = (i = 0) => cds.run(`GRANT CREATE, CONNECT ON DATABASE "${creds.database}" TO "${creds.user}";`)
+          .catch((err) => {
+            if (i > 100) throw err
+            return grant(i + 1)
+          })
+        await grant()
       }
 
       // Update credentials to new Schema owner
@@ -610,7 +633,7 @@ GROUP BY k
       // Create new schema using schema owner
       await this.tx(async tx => {
         await tx.run(`DROP SCHEMA IF EXISTS "${creds.schema}" CASCADE`)
-        if (!clean) await tx.run(`CREATE SCHEMA "${creds.schema}" AUTHORIZATION "${creds.user}"`).catch(() => { })
+        if (!clean) await tx.run(`CREATE SCHEMA "${creds.schema}" AUTHORIZATION "${creds.user}"`)
       })
     } finally {
       await this.disconnect()

package/lib/cql-functions.js

@@ -24,6 +24,26 @@ const StandardFunctions = {
   minute: x => `date_part('minute', ${castVal(x)})`,
   second: x => `floor(date_part('second', ${castVal(x)}))`,
   fractionalseconds: x => `CAST(date_part('second', ${castVal(x)}) - floor(date_part('second', ${castVal(x)})) AS DECIMAL)`,
+  totalseconds: x => `(
+    (
+      (
+        CAST(substring(${x},2,strpos(${x},'DT') - 2) AS INTEGER)
+      ) + (
+        EXTRACT (EPOCH FROM 
+          CAST(
+            replace(
+            replace(
+            replace(
+              substring(${x},strpos(${x},'DT') + 2),
+              'H',':'
+            ),'M',':'
+            ),'S','Z'
+            )
+          as TIME)
+        ) - 0.5
+      )
+    ) * 86400
+  )`,
   now: function() {
     return this.session_context({val: '$now'})
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {
@@ -23,8 +23,8 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "npm start && jest --silent",
-    "start": "docker-compose -f pg-stack.yml up -d"
+    "test": "npm start && cds-test $(../test/find)",
+    "start": "docker compose -f pg-stack.yml up -d"
   },
   "dependencies": {
     "@cap-js/db-service": "^1.9.0",
@@ -67,6 +67,12 @@
         }
       },
       "db": "sql"
+    },
+    "schema": {
+      "buildTaskType": {
+        "name": "postgres",
+        "description": "Postgres database build plugin"
+      }
     }
   },
   "license": "SEE LICENSE"