@cap-js/postgres 1.3.1 → 1.4.1

package/CHANGELOG.md

@@ -1,14 +1,35 @@
-# Change Log
+# Changelog
 
 - All notable changes to this project are documented in this file.
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
-### Version 1.3.1 - 2023-10-10
+## [1.4.1](https://github.com/cap-js/cds-dbs/compare/postgres-v1.4.0...postgres-v1.4.1) (2023-11-24)
+
+
+### Fixed
+
+* `cds build` now generates the correct output folder structure for Node.js and Java apps. ([#353](https://github.com/cap-js/cds-dbs/issues/353)) ([875aca4](https://github.com/cap-js/cds-dbs/commit/875aca4f5a0ee71bcfbb13be47d4349970b40605))
+
+## [1.4.0](https://github.com/cap-js/cds-dbs/compare/postgres-v1.3.1...postgres-v1.4.0) (2023-11-20)
+
+
+### Added
+
+* adapt build plugin implementation to new API ([#319](https://github.com/cap-js/cds-dbs/issues/319)) ([aec9966](https://github.com/cap-js/cds-dbs/commit/aec9966e54cd9900f85fe7406cbe38ec5c6fa4b9))
+
+
+### Fixed
+
+* align time function behavior ([#322](https://github.com/cap-js/cds-dbs/issues/322)) ([c3ab40a](https://github.com/cap-js/cds-dbs/commit/c3ab40a007c105465349dd2f612178367b8e713a))
+
+## [1.3.1](https://github.com/cap-js/cds-dbs/compare/v1.3.0...v1.3.1) (2023-10-10)
+
+### Fixed
 
 - `cds build`-relevant files are now correctly packaged into the release. #266
 
-### Version 1.3.0 - 2023-10-06
+## Version 1.3.0 - 2023-10-06
 
 ### Added
 

package/README.md

@@ -6,14 +6,12 @@ Welcome to the new Postgres database service for [SAP Cloud Application Programm
 
 In general, all you need to do is to install one of the database packages, as follows:
 
-
 ```sh
 npm add @cap-js/postgres
 ```
 
 Learn more about setup and usage in the [respective database guide](https://cap.cloud.sap/docs/guides/databases-postgres).
 
-
 ## Support
 
 This project is open to feature requests/suggestions, bug reports etc. via [GitHub issues](https://github.com/cap-js/cds-dbs/issues).
@@ -22,6 +20,11 @@ This project is open to feature requests/suggestions, bug reports etc. via [GitH
 
 Contribution and feedback are encouraged and always welcome. For more information about how to contribute, the project structure, as well as additional contribution information, see our [Contribution Guidelines](CONTRIBUTING.md).
 
+## Versioning
+
+This library follows [Semantic Versioning](https://semver.org/).
+All notable changes are documented in [CHANGELOG.md](CHANGELOG.md).
+
 ## Code of Conduct
 
 We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone. By participating in this project, you agree to abide by its [Code of Conduct](CODE_OF_CONDUCT.md) at all times.

package/cds-plugin.js

@@ -1,9 +1,11 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 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.')
 }
 
-if (cds.cli.command === 'build') {
-  module.exports = require('./lib/build')
-}
+// requires @sap/cds-dk version >= 7.3.2
+cds.build?.register?.('postgres', {
+  impl: '@cap-js/postgres/lib/build.js',
+  taskDefaults: { src: cds.env.folders.db }
+})

package/lib/build.js

@@ -1,43 +1,31 @@
 const cds = require('@sap/cds')
+const { fs, path } = cds.utils
 
-let BuildPlugin
-try {
-  ({ BuildPlugin } = require('@sap/cds-dk/lib/build'))
-} catch (e) {
-  if (e.code === 'ENOTFOUND') throw `No build plugin mechanism for @sap/cds-dk found. Please install @sap/cds-dk for development using 'npm i -D @sap/cds-dk@^7.3.0'`
-  else throw e
-}
-
-const { fs, path, rimraf } = cds.utils
-
-module.exports = class PostgresBuildPlugin extends BuildPlugin {
-  static hasTask() { // REVISIT: should be unnecessary -> plugin mechanism knows what to pull
-    return cds.requires.db.kind === 'postgres'
-  }
-
-  static getTaskDefaults() {
-    return { src: cds.env.folders.db }
+module.exports = class PostgresBuildPlugin extends cds.build.BuildPlugin {
+  static hasTask() {
+    return cds.requires.db?.kind === 'postgres'
   }
 
   init() {
-    this.task.dest = cds.env.build.target === '.' ? path.join('gen','pg') : path.join('gen', 'pg')
-  }
-
-  async clean() {
-    await rimraf(this.task.dest)
+    // 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() {
     const model = await this.model()
-    if (!model) {
-      return
-    }
+    if (!model) return
 
     const promises = []
-    promises.push(this.write({
-        dependencies: { '@sap/cds': '^7', '@cap-js/postgres': '^1' },
-        scripts: { start: 'cds-deploy' },
-      }).to('package.json'))
+    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': '^7', '@cap-js/postgres': '^1' },
+          scripts: { start: 'cds-deploy' },
+        }).to('package.json'),
+      )
+    }
     promises.push(this.write(cds.compile.to.json(model)).to(path.join('db', 'csn.json')))
 
     let data

package/lib/func.js

@@ -13,14 +13,18 @@ const StandardFunctions = {
   endswith: (x, y) => `substr(${x},length(${x}) + 1 - length(${y})) = ${y}`,
 
   // Date and Time Functions
-  year: x => `date_part('year',(${x})::TIMESTAMP)`,
-  month: x => `date_part('month',(${x})::TIMESTAMP)`,
-  day: x => `date_part('day',(${x})::TIMESTAMP)`,
-  hour: x => `date_part('hour',(${x})::TIMESTAMP)`,
-  minute: x => `date_part('minute',(${x})::TIMESTAMP)`,
-  second: x => `date_part('second',(${x})::TIMESTAMP)`,
+  year: x => `date_part('year', ${castVal(x)})`,
+  month: x => `date_part('month', ${castVal(x)})`,
+  day: x => `date_part('day', ${castVal(x)})`,
+  hour: x => `date_part('hour', ${castVal(x)})`,
+  minute: x => `date_part('minute', ${castVal(x)})`,
+  second: x => `date_part('second', ${castVal(x)})`,
 }
 
+const isTime = /^\d{1,2}:\d{1,2}:\d{1,2}$/
+const isVal = x => x && 'val' in x
+const castVal = (x) => `${x}${isVal(x) ? isTime.test(x.val) ? '::TIME' : '::TIMESTAMP' : ''}`
+
 const HANAFunctions = {
   // https://help.sap.com/docs/SAP_HANA_PLATFORM/4fe29514fd584807ac9f2a04f6754767/f12b86a6284c4aeeb449e57eb5dd3ebd.html
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {
@@ -39,7 +39,7 @@
     "@sap/cds-dk": ">=7"
   },
   "peerDependenciesMeta": {
-    "cds-dk": {
+    "@sap/cds-dk": {
       "optional": true
     }
   },