From 3bbde186848ad97ff1191ce3fc50fc4c9f90dee3 Mon Sep 17 00:00:00 2001 From: Daniel Hutzel Date: Tue, 3 Sep 2024 12:11:19 +0200 Subject: [PATCH] deps: requires @sap/cds >= 8.2 (#789) Requires next release of @sap/cds with internal PR 4589 merged --------- Co-authored-by: Johannes Vogel Co-authored-by: Johannes Vogel <31311694+johannes-vogel@users.noreply.github.com> --- hana/package.json | 2 +- package-lock.json | 17 +++++++---------- test/cds.js | 18 ------------------ 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/hana/package.json b/hana/package.json index ac457cec1..0f3a54974 100644 --- a/hana/package.json +++ b/hana/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": { "@sap/hana-client": ">=2", - "@sap/cds": ">=7.6" + "@sap/cds": ">=8.2" }, "peerDependenciesMeta": { "@sap/hana-client": { diff --git a/package-lock.json b/package-lock.json index 6c0cf21f1..9669fb19a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1073,12 +1073,11 @@ } }, "node_modules/@sap/cds": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.0.3.tgz", - "integrity": "sha512-uX/tP0eeDMYXY34itmzTPJgfluAhmbisds8ujNBHbGCqXVAOdMFUDs4wUaqWeqsj3irP6Z1PISxG2nOxn+QrcQ==", - "license": "SEE LICENSE IN LICENSE", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.2.0.tgz", + "integrity": "sha512-sc/xzoIVXhp4Kgeeu1yBCJfJCHXqDkb0qbQPfwKMoJCnSDNA5CiBIXyE9y0i8uG+6H2RZXkotq05zoWVL9HWmw==", "dependencies": { - "@sap/cds-compiler": ">=5", + "@sap/cds-compiler": ">=5.1", "@sap/cds-fiori": "^1", "@sap/cds-foss": "^5.0.0" }, @@ -1101,10 +1100,9 @@ } }, "node_modules/@sap/cds-compiler": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.0.6.tgz", - "integrity": "sha512-OxLlK3hGWQdMBOYmLw18tpusfb+5G+44yFq28cGegNVlUu1jKtnSu/VIb9fIDYExxbIs9E9J4R2bGmQzaawFFQ==", - "license": "SEE LICENSE IN LICENSE", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-5.2.0.tgz", + "integrity": "sha512-ymp1ChXMbU5D6P6O7QOaM8J5DUVNjtm6hr8EXoQsywtwwKuMp5UfM5n6+ube1MmInU3L9nI57l/3G3MacK+6Qg==", "dependencies": { "antlr4": "4.9.3" }, @@ -1388,7 +1386,6 @@ "version": "4.9.3", "resolved": "https://registry.npmjs.org/antlr4/-/antlr4-4.9.3.tgz", "integrity": "sha512-qNy2odgsa0skmNMCuxzXhM4M8J1YDaPv3TI+vCdnOAanu0N982wBrSqziDKRDctEZLZy9VffqIZXc0UGjjSP/g==", - "license": "BSD-3-Clause", "engines": { "node": ">=14" } diff --git a/test/cds.js b/test/cds.js index 4fe8827fc..a95af55d0 100644 --- a/test/cds.js +++ b/test/cds.js @@ -17,24 +17,6 @@ typeMapping.cdsToSqlTypes.postgres = { const cds = require('@sap/cds') module.exports = cds -// Adding cds.hana types to cds.builtin.types -// REVISIT: Where should we put this? -const hana = cds.linked({ - definitions: { - 'cds.hana.SMALLDECIMAL': { type: 'cds.Decimal' }, - 'cds.hana.SMALLINT': { type: 'cds.Int16' }, - 'cds.hana.TINYINT': { type: 'cds.UInt8' }, - 'cds.hana.REAL': { type: 'cds.Double' }, - 'cds.hana.CHAR': { type: 'cds.String' }, - 'cds.hana.CLOB': { type: 'cds.String' }, - 'cds.hana.NCHAR': { type: 'cds.String' }, - 'cds.hana.BINARY': { type: 'cds.String' }, - 'cds.hana.ST_POINT': { type: 'cds.String' }, - 'cds.hana.ST_GEOMETRY': { type: 'cds.String' }, - }, -}) -Object.assign(cds.builtin.types, hana.definitions) - const cdsTest = cds.test let isolateCounter = 0