@sap/cds 7.0.2 → 7.1.0

package/CHANGELOG.md

@@ -4,6 +4,64 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.1.0 - 2023-07-28
+
+### Added
+
+- Support for resolving of `STREAM` CQN queries that point to views
+- Enable PDF export via GET to collection with accept header `appplication/pdf`.
+  Custom handler must return the following:
+  ```
+  {
+    value: <instance of Readable>,
+    $mediaContentType: <String>, // > optional, defaults to: application/pdf
+    $mediaContentDispositionFilename: <String>, // > optional
+    $mediaContentDispositionType: <String> // > optional, defaults to 'attachment' if $mediaContentDispositionFilename is set
+  }
+  ```
+- Schema for `cds` entry in `package.json` now has a tooltip and default value
+- `srv.endpoints`: Array containing the information for all endpoints at which the service is served.
+  Example:
+  ```
+  [
+    { kind: 'odata-v4', path: '/odata/v4/browse' },
+    { kind: 'rest', path: '/rest/browse' }
+  ]
+  ```
+
+### Fixed
+
+- Multiple TypeScript improvements
+- Proper handling for `expand=*` for OData URL to CQN parser (`cds.env.features.odata_new_parser`)
+- Fully qualified operation names are correctly resolved in rest adapter
+- Log level for odata metadata cache was not handled correctly
+- Protocol paths are normalized to always have a leading slash
+- `@odata` shortcut for `odata-v4` protocol with custom configuration
+- Default protocol is `odata-v4`, independent of the order in `cds.env.protocols`
+- Data is not logged for GET and DELETE remote requests
+- draft: deep update without change should not update the `modifiedAt` field
+- Lean draft: do not propagate `@Capabilities.NavigationRestrictions.RestrictedProperties`
+- Commit db transaction only once outbound streaming has ended
+- Lean draft: deactivate legacy `drafts` getter
+- Updated typings for srv.send
+- `$search`: exclude calculated fields/expressions from default search in projection of projections
+- Immutable properties are always removed from payload during UPDATE
+- `serviceinfo.urlPath` contains the first endpoint of the service (cf. `srv.endpoints`), which is the legacy path if `cds.env.features.serve_on_root === true`
+
+## Version 7.0.3 - 2023-07-19
+
+### Fixed
+
+- Compile for lean draft: do not add draft entity for external entities
+- Rollback awaited in REST adapter
+- `service.on('error')` handler invoked only once
+- `SELECT.one.localized`
+- `COPYFILE_DISABLE=1` is now set for building `tar` archives by default
+- Actions of projection target are no longer accessible in linked models
+- Batch execute model-less mass inputs when on `@sap/hana-client`
+- Requests to `/<path>/webapp` return 404 for absolute `@path` specifications
+- `cds compile --to serviceinfo` no longer returns paths w/ Windows `\` path characters
+
 ## Version 7.0.2 - 2023-07-06
 
 ### Fixed
@@ -60,19 +118,18 @@
 - Support for multiline texts in `properties` files
 - Error when reading auth protected entities with infix filter in expand
 - Glitch in transaction handling in case of concurrent async before handlers
-- Detection of feature toggles in single-tenant mode
 
 ### Removed
 
 - Deprecated `req.run()` function, use `cds.run()` instead.
-- Deprecated compat mode `cds.env.features.cds_tx_protection = false`
-- Deprecated referential integrity checks at runtime
 - Support for inofficial feature flag `cds.env.features.bigjs`
 - Support for inofficial feature flag `cds.features.parameterized_numbers`
+- Deprecated referential integrity checks at runtime
 - Support for `cds-mtx`
 - Support for Node 14
 - Internal `req.getUriInfo()` and `req.getUrlObject()`
 - `cds deploy --to hana` is now part of `@sap/cds-dk`.
+- Deprecated compat mode `cds.env.features.cds_tx_protection = false`
 - Beta `AuditLogService` and out-of-the-box audit logging. Use plugin `@cap-js/audit-logging` instead.
 
 ## Version 6.8.3 - 2023-06-13

package/_i18n/i18n_ar.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=\u0631\u0645\u0632 \u0627\u0644\u0639\u0645\u0644\u0629
 #XTIT: Currency Symbol
 CurrencySymbol=\u0631\u0645\u0632 \u0627\u0644\u0639\u0645\u0644\u0629
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u0643\u0633\u0648\u0631 \u0648\u062D\u062F\u0627\u062A \u062B\u0627\u0646\u0648\u064A\u0629 \u0644\u0644\u0639\u0645\u0644\u0629
+
 #XTIT: Country/Region
 Country=\u0627\u0644\u062F\u0648\u0644\u0629/\u0627\u0644\u0645\u0646\u0637\u0642\u0629
 

package/_i18n/i18n_cs.properties

@@ -26,7 +26,7 @@
 #----------------------------------------------------------------------------------------------------------------------
 
 #XTIT: Created By (Answer to: "Which user has created a certain entity?")
-CreatedBy=Vytvo\u0159il
+CreatedBy=Vytvo\u0159il(a)
 
 #XTIT: Created On (Answer to: "When has a certain entity been created?")
 CreatedAt=Vytvo\u0159eno dne
@@ -49,6 +49,9 @@ CurrencyCode.Description=K\u00F3d m\u011Bny zadan\u00FD dle ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Symbol m\u011Bny
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Zlomky pomocn\u00E9 jednotky m\u011Bny
+
 #XTIT: Country/Region
 Country=St\u00E1t/region
 

package/_i18n/i18n_da.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Valutakode som angivet af ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Valutasymbol
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Valutahj\u00E6lpeenhedsandele
+
 #XTIT: Country/Region
 Country=Land/region
 

package/_i18n/i18n_de.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=W\u00E4hrungscode gem\u00E4\u00DF ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=W\u00E4hrungssymbol
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Bruchteile W\u00E4hrungsuntereinheit
+
 #XTIT: Country/Region
 Country=Land/Region
 

package/_i18n/i18n_en.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Currency code as specified by ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Currency Symbol
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Currency Minor Unit Fractions
+
 #XTIT: Country/Region
 Country=Country/Region
 

package/_i18n/i18n_es.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=C\u00F3digo de moneda seg\u00FAn especificado por ISO 4
 #XTIT: Currency Symbol
 CurrencySymbol=S\u00EDmbolo de moneda
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Fracciones unidad secundaria de moneda
+
 #XTIT: Country/Region
 Country=Pa\u00EDs/Regi\u00F3n
 

package/_i18n/i18n_fi.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=ISO 4217:n mukainen valuuttakoodi
 #XTIT: Currency Symbol
 CurrencySymbol=Valuuttatunnus
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Valuutan pienen yksik\u00F6n murto-osat
+
 #XTIT: Country/Region
 Country=Maa/alue
 

package/_i18n/i18n_fr.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Code de devise tel qu'indiqu\u00E9 par ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Symbole de devise
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Fractions de l'unit\u00E9 secondaire de la devise
+
 #XTIT: Country/Region
 Country=Pays/R\u00E9gion
 

package/_i18n/i18n_it.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Codice divisa come indicato da ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Simbolo divisa
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Frazioni suddivisione unit\u00E0 monetaria
+
 #XTIT: Country/Region
 Country=Paese/regione
 

package/_i18n/i18n_ja.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=ISO 4217 \u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u30
 #XTIT: Currency Symbol
 CurrencySymbol=\u901A\u8CA8\u30B7\u30F3\u30DC\u30EB
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u901A\u8CA8\u88DC\u52A9\u5358\u4F4D\u306E\u5206\u6570
+
 #XTIT: Country/Region
 Country=\u56FD/\u5730\u57DF
 

package/_i18n/i18n_ko.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=ISO 4217\uC5D0\uC11C \uC9C0\uC815\uD55C \uD1B5\uD654 \u
 #XTIT: Currency Symbol
 CurrencySymbol=\uD1B5\uD654 \uAE30\uD638
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\uD1B5\uD654 \uBCF4\uC870 \uB2E8\uC704 \uC18C\uC218 \uC790\uB9AC
+
 #XTIT: Country/Region
 Country=\uAD6D\uAC00/\uC9C0\uC5ED
 

package/_i18n/i18n_ms.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Kod mata wang seperti yang dinyatakan dalam ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Simbol Mata Wang
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Pecahan Unit Kecil Mata Wang
+
 #XTIT: Country/Region
 Country=Negara/Wilayah
 

package/_i18n/i18n_nl.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Valutacode zoals gespecificeerd door ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Valutasymbool
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Breuken kleinste eenheid valuta
+
 #XTIT: Country/Region
 Country=Land/regio
 

package/_i18n/i18n_no.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Valutakode som definert i ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Valutasymbol
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Deler for valutaunderenhet
+
 #XTIT: Country/Region
 Country=Land/region
 

package/_i18n/i18n_pl.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Kod waluty okre\u015Blony zgodnie z norm\u0105 ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Symbol waluty
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Warto\u015Bci u\u0142amkowe jednostki pomocniczej waluty
+
 #XTIT: Country/Region
 Country=Kraj/region
 

package/_i18n/i18n_pt.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=C\u00F3digo de moeda como especificado pelo ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=S\u00EDmbolo da moeda
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Fra\u00E7\u00F5es de unidade auxiliar de moeda
+
 #XTIT: Country/Region
 Country=Pa\u00EDs/regi\u00E3o
 

package/_i18n/i18n_ro.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Cod moned\u0103 a\u0219a cum este specificat de ISO 421
 #XTIT: Currency Symbol
 CurrencySymbol=Simbol moned\u0103
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Frac\u021Bii subunitate de moned\u0103
+
 #XTIT: Country/Region
 Country=\u021Aar\u0103/regiune
 

package/_i18n/i18n_ru.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=\u041A\u043E\u0434 \u0432\u0430\u043B\u044E\u0442\u044B
 #XTIT: Currency Symbol
 CurrencySymbol=\u0421\u0438\u043C\u0432\u043E\u043B \u0432\u0430\u043B\u044E\u0442\u044B
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u0414\u043E\u043B\u0438 \u0432\u0441\u043F\u043E\u043C\u043E\u0433\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0439 \u0432\u0430\u043B\u044E\u0442\u043D\u043E\u0439 \u0435\u0434\u0438\u043D\u0438\u0446\u044B
+
 #XTIT: Country/Region
 Country=\u0421\u0442\u0440\u0430\u043D\u0430/\u0440\u0435\u0433\u0438\u043E\u043D
 

package/_i18n/i18n_sv.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=Valutakod enligt ISO 4217
 #XTIT: Currency Symbol
 CurrencySymbol=Valutasymbol
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=Antal mindre enheter f\u00F6r valuta
+
 #XTIT: Country/Region
 Country=Land/region
 

package/_i18n/i18n_th.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=\u0E23\u0E2B\u0E31\u0E2A\u0E2A\u0E01\u0E38\u0E25\u0E40\
 #XTIT: Currency Symbol
 CurrencySymbol=\u0E2A\u0E31\u0E0D\u0E25\u0E31\u0E01\u0E29\u0E13\u0E4C\u0E2A\u0E01\u0E38\u0E25\u0E40\u0E07\u0E34\u0E19
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u0E40\u0E28\u0E29\u0E2A\u0E48\u0E27\u0E19\u0E2B\u0E19\u0E48\u0E27\u0E22\u0E23\u0E2D\u0E07\u0E02\u0E2D\u0E07\u0E2A\u0E01\u0E38\u0E25\u0E40\u0E07\u0E34\u0E19
+
 #XTIT: Country/Region
 Country=\u0E1B\u0E23\u0E30\u0E40\u0E17\u0E28/\u0E20\u0E39\u0E21\u0E34\u0E20\u0E32\u0E04
 

package/_i18n/i18n_zh_CN.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=ISO 4217 \u6307\u5B9A\u7684\u8D27\u5E01\u4EE3\u7801
 #XTIT: Currency Symbol
 CurrencySymbol=\u8D27\u5E01\u7B26\u53F7
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u8D27\u5E01\u6B21\u8981\u5355\u4F4D\u90E8\u5206
+
 #XTIT: Country/Region
 Country=\u56FD\u5BB6/\u5730\u533A
 

package/_i18n/i18n_zh_TW.properties

@@ -49,6 +49,9 @@ CurrencyCode.Description=\u5DF2\u6309 ISO 4217 \u6307\u5B9A\u516C\u53F8\u4EE3\u7
 #XTIT: Currency Symbol
 CurrencySymbol=\u5E63\u5225\u7B26\u865F
 
+#XTIT: Currency Minor Unit Fractions (Answer to: "How many fractions has a currency's minor unit?", e.g. "0" or "2")
+CurrencyMinorUnit=\u5E63\u5225\u6B21\u8981\u55AE\u4F4D\u5206\u6578
+
 #XTIT: Country/Region
 Country=\u570B\u5BB6/\u5730\u5340
 

package/apis/core.d.ts

@@ -2,8 +2,31 @@
 import { ReflectedModel, LinkedModel, LinkedDefinition } from './reflect'
 import { CSN as csn, Definition } from './csn'
 
+type UserInput = string | { id: string; attr: Record<string, string>; roles: Record<string, string> } | User
 
-export = cds
+export class User {
+  constructor(obj?: UserInput)
+  id: string
+  /**
+   * @deprecated Use https://cap.cloud.sap/docs/node.js/events#locale instead
+   */
+  locale: string
+  /**
+   * @deprecated Use https://cap.cloud.sap/docs/node.js/events#tenant instead
+   */
+  tenant: string | undefined
+  attr: Record<string, string>
+  roles: Record<string, string>
+  static Privileged: typeof Privileged
+  is(role: string): boolean
+}
+/**
+ * Subclass for executing code with superuser privileges.
+ */
+declare class Privileged extends User {
+  constructor()
+  is(): boolean
+}
 
 declare class cds {
   /**
@@ -22,7 +45,7 @@ declare class cds {
    * Represents the user in a given context.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/authentication#cds-user)
    */
-  User: typeof cds.User
+  User: typeof User
 
   // infer (query : cqn, model : csn) : LinkedDefinition
 
@@ -105,31 +128,4 @@ declare class cds {
   lazified: <T>(target: T) => T
 }
 // & typeof import ('../lib/index')
-
-declare namespace cds {
-  type UserInput = string | { id: string; attr: Record<string, string>; roles: Record<string, string> } | User
-
-  export class User {
-    constructor(obj?: UserInput)
-    id: string
-    /**
-     * @deprecated Use https://cap.cloud.sap/docs/node.js/events#locale instead
-     */
-    locale: string
-    /**
-     * @deprecated Use https://cap.cloud.sap/docs/node.js/events#tenant instead
-     */
-    tenant: string | undefined
-    attr: Record<string, string>
-    roles: Record<string, string>
-    static Privileged: typeof Privileged
-    is(role: string): boolean
-  }
-  /**
-   * Subclass for executing code with superuser privileges.
-   */
-  class Privileged extends User {
-    constructor()
-    is(): boolean
-  }
-}
+export = cds

package/apis/cqn.d.ts

@@ -1,5 +1,6 @@
 import { entity } from "./csn"
 
+export type CQNQuery = SELECT & INSERT & UPDATE & DELETE & CREATE & DROP & UPSERT
 export type Query = SELECT | INSERT | UPDATE | DELETE | CREATE | DROP | UPSERT
 export type ParsedExpr = expr & { _:string }
 

package/apis/ql.d.ts

@@ -2,6 +2,7 @@ import { Definition } from "./csn"
 import * as CQN from "./cqn"
 import { Constructable, ArrayConstructable, SingularType } from "./internal/inference"
 
+export type CQNQuery = CQN.CQNQuery
 export type Query = CQN.Query
 
 export class ConstructedQuery {
@@ -239,6 +240,7 @@ export class INSERT<T> extends ConstructedQuery {
 	columns (...col: string[]) : this
 	values (... val: any[]) : this
 	rows (... row: any[]) : this
+	as (select: SELECT<T>): this
 	INSERT : CQN.INSERT["INSERT"]
 }
 

package/apis/serve.d.ts

@@ -36,6 +36,8 @@ declare class cds_serve {
 	 */
 	server: cds_server
 
+	
+
 	/**
 	 * Emitted at the very beginning of the bootsrapping process, when the
 	 * express application has been constructed but no middlewares or routes
@@ -63,6 +65,13 @@ declare class cds_serve {
 	on   (event : 'listening', listener : (args : { server: http.Server, url:string }) => void) : this
 	once (event : 'listening', listener : (args : { server: http.Server, url:string }) => void) : this
 
+	/**
+	 * Emitted by the default, built-in `server.js` when the http server
+	 * is shutdown.
+	 */
+	on (event : 'shutdown', listener : () => void) : this
+	once (event : 'shutdown', listener : () => void) : this
+
 	/**
 	 * Dictionary of all services constructed and/or connected.
 	 */

package/apis/services.d.ts

@@ -1,4 +1,4 @@
-import { SELECT, INSERT, UPDATE, DELETE, Query, ConstructedQuery, UPSERT } from './ql'
+import { SELECT, INSERT, UPDATE, DELETE, CQNQuery, Query, ConstructedQuery, UPSERT } from './ql'
 import { Awaitable } from './ql'
 import { ArrayConstructable, Constructable } from './internal/inference'
 import { LinkedModel, Definition, Definitions } from './reflect'
@@ -180,6 +180,7 @@ export class Service extends QueryAPI {
     <T = any>(details: { event: Events; data?: object; headers?: object }): Promise<T>
     <T = any>(details: { query: ConstructedQuery; data?: object; headers?: object }): Promise<T>
     <T = any>(details: { method: Event; path: string; data?: object; headers?: object }): Promise<T>
+    <T = any>(details: { event: Event; entity: Definition | string; data?: object; params?: object }): Promise<T>
   }
 
   /**
@@ -389,7 +390,7 @@ interface Request extends EventMessage {
    * @see https://cap.cloud.sap/docs/node.js/events#req-entity
    */
   entity: string
-  query: Query
+  query: CQNQuery
   subject: ref
 
   reply(results: any): void

package/lib/compile/for/lean_drafts.js

@@ -33,24 +33,25 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
   }
 
   const { Draft } = cds.linked(`
-  entity ActiveEntity { key ID: UUID; }
-  entity Draft {
-    virtual IsActiveEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
-    virtual HasDraftEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
-    HasActiveEntity                   : Boolean; // This should be written !!!
-    DraftAdministrativeData           : Association to DRAFT.DraftAdministrativeData;
-    DraftAdministrativeData_DraftUUID : UUID;
-    // SiblingEntity                  : Association to ActiveEntity; // REVISIT: Why didn't we use a managed assoc here?
-  }
-  entity DRAFT.DraftAdministrativeData {
-    key DraftUUID         : UUID;
-    LastChangedByUser     : String(256);  LastChangeDateTime : Timestamp;
-    CreatedByUser         : String(256);  CreationDateTime   : Timestamp;
-    InProcessByUser       : String(256);
-    DraftIsCreatedByMe    : Boolean; // REVISIT: these are calculated fields, aren't they?
-    DraftIsProcessedByMe  : Boolean; // REVISIT: these are calculated fields, aren't they?
-  }
-`).definitions
+    entity ActiveEntity { key ID: UUID; }
+    entity Draft {
+      virtual IsActiveEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
+      virtual HasDraftEntity            : Boolean; // REVISIT: these are calculated fields, aren't they?
+      HasActiveEntity                   : Boolean; // This should be written !!!
+      DraftAdministrativeData           : Association to DRAFT.DraftAdministrativeData;
+      DraftAdministrativeData_DraftUUID : UUID;
+      // SiblingEntity                  : Association to ActiveEntity; // REVISIT: Why didn't we use a managed assoc here?
+    }
+    entity DRAFT.DraftAdministrativeData {
+      key DraftUUID         : UUID;
+      LastChangedByUser     : String(256);  LastChangeDateTime : Timestamp;
+      CreatedByUser         : String(256);  CreationDateTime   : Timestamp;
+      InProcessByUser       : String(256);
+      DraftIsCreatedByMe    : Boolean; // REVISIT: these are calculated fields, aren't they?
+      DraftIsProcessedByMe  : Boolean; // REVISIT: these are calculated fields, aren't they?
+    }
+  `).definitions
+
   function addDraftEntity(active, model) {
     const _draftEntity = active.name + '.drafts'
     const d = model.definitions[_draftEntity]
@@ -75,6 +76,7 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
     if ('@Capabilities.DeleteRestrictions.Deletable' in draft) draft['@Capabilities.DeleteRestrictions.Deletable'] = undefined
     if ('@Capabilities.InsertRestrictions.Insertable' in draft) draft['@Capabilities.InsertRestrictions.Insertable'] = undefined
     if ('@Capabilities.UpdateRestrictions.Updatable' in draft) draft['@Capabilities.UpdateRestrictions.Updatable'] = undefined
+    if ('@Capabilities.NavigationRestrictions.RestrictedProperties' in draft) draft['@Capabilities.NavigationRestrictions.RestrictedProperties'] = undefined
 
     // Recursively add drafts for compositions
     for (const each in draft.elements) {
@@ -104,9 +106,10 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
     }
     return draft
   }
+
   for (const name in csn.definitions) {
     const def = csn.definitions[name]
-    if (!_isDraft(def)) continue
+    if (!_isDraft(def) || def['@cds.external']) continue
     def.elements.IsActiveEntity.virtual = true
     def.elements.HasDraftEntity.virtual = true
     def.elements.HasActiveEntity.virtual = true

package/lib/compile/to/srvinfo.js

@@ -35,40 +35,28 @@ module.exports = (model, options={}) => {
     }
   }
   function _makeNode(service) {
-    const path = _effectiveNodePath(service)
     return {
       name: service.name,
-      urlPath: _url4 (path),
+      urlPath: _url4 (cds.service.path4(service)),
       destination: 'srv-api', // the name to register in xs-app.json
       runtime: 'Node.js',
       location: service.$location
     }
   }
 
-  // TODO use a function from cds.service... instead
-  function _effectiveNodePath(service) {
-    if (service['@path']?.[0] === '/') { // absolute path given
-      return service['@path']
-    }
-    const { ProtocolAdapter } = cds.service.protocols
-    const prots = ProtocolAdapter.protocols4(service)
-    const prot = prots.find(p => p.kind.startsWith('odata')) || prots[0] // prefer odata for compat. reasons
-    if (prot.path && prot.path.startsWith('/')) {
-      return prot.path
-    }
-    const rootPath = cds.env.requires.middlewares ? ProtocolAdapter.protocols[prot.kind]?.path || '' : ''
-    return join(rootPath, prot.path || cds.service.path4(service))
-  }
-
    // the URL path that is *likely* effective at runtime
   function _url4 (p) {
-    return normalize (p.replace(/^\/+/, '') + '/') //> /foo/bar  ->  foo/bar/
+    p = p.replace(/\\/g, '/') // handle Windows
+         .replace(/^\/+/, '') // strip leading
+         .replace(/\/+$/, '') // strip trailing
+    p += '/' // end with /
+    return p
   }
 
   function _javaPath (service) {
     const d = model.definitions[service.name]
     const path = d && d['@path'] ? d['@path'].replace(/^[^/]/, c => '/'+c) : service.name
-    return join(javaPrefix, path).replace(/\\/g, '/')
+    return join(javaPrefix, path)
   }
 
   function _isNodeProject(root) {

package/lib/dbs/cds-deploy.js

@@ -102,13 +102,18 @@ exports.create = async function cds_deploy_create (db, csn=db.model, o) {
     creas = cds.compile.to.sql(csn, o)
   }
 
-  if (!drops)
-    drops = creas
-      .map(each => {
+  if (!drops) {
+    drops = [];
+    creas.forEach(each => {
+        // For postgres, we add constraints via "ALTER TABLE" - so our regex might not match.
         let [, kind, entity] = each.match(/^CREATE (TABLE|VIEW) ("[^"]+"|[^\s(]+)/im) || []
-        return `DROP ${kind} IF EXISTS ${entity};`
-      })
-      .reverse()
+        if(kind && entity)
+          drops.push(`DROP ${kind} IF EXISTS ${entity};`);
+      });
+
+    drops.reverse()
+  }
+
 
   if (!drops.length && !creas.length) return !o.dry
 

package/lib/env/cds-env.js

@@ -73,10 +73,7 @@ class Config {
     // 5. link dependent services
     this._link_required_services()
 
-    // 6. complete service configurations from cloud service bindings
-    this._add_cloud_service_bindings(process.env)
-
-    // 7. Add compatibility and correlations for mtx
+    // 6. Add compatibility and correlations for mtx
     const db  = this.requires?.db
     if (this.requires?.db) {
       if (this.requires.multitenancy !== undefined)
@@ -86,6 +83,8 @@ class Config {
     }
     if (this.requires?.multitenancy && this.requires.db?.kind === 'hana' && !this.requires.db.vcap) Object.assign(this.requires.db, { vcap: { label: 'service-manager' } })
 
+    // 7. complete service configurations from cloud service bindings
+    this._add_cloud_service_bindings(process.env)
 
     // 8. apply presets
     presets (this)