@sap/cds-dk 6.4.0 → 6.4.1

package/CHANGELOG.md

@@ -7,12 +7,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.4.1 - 2022-01-17
+
+### Fixed
+
+- `cds deploy -2 sqlite` now preserves the `schema_evolution` setting in the `package.json`.
+- `cds import` bug fix for OData V4 import crash.
+
 ## Version 6.4.0 - 2022-12-15
 
 ### Added
 
 - `cds add helm` now supports approuter.
-- `cds subscribe --local` starts @sap/cds-mtxs locally instead of contacting a running instance via URL.
+- `cds subscribe --local` starts `@sap/cds-mtxs` locally instead of contacting a running instance via URL.
 - `cds unsubscribe` removes the subscription of a tenant from a SaaS app.
 
 ### Changed

package/bin/deploy/index.js

@@ -112,10 +112,12 @@ async function update_package_json (kind, model, database) {
   const { readFile, writeFile } = fs.promises
   const package_json = path.resolve ('package.json'), exists = isfile (package_json)
   const conf = exists ? JSON.parse (await readFile (package_json)) : {}
-  const requires = ['cds','requires'] .reduce ((p,n)=>p[n] || (p[n]={}), conf)
+  const requires = conf.cds?.requires
+  const { schema_evolution } = requires?.db ?? {}
   requires.db = cds.env.requires.db = { kind, model }
   if (database)  requires.db.credentials = { database }
   else if (kind === 'sqlite') requires.db.credentials = { database:'db.sqlite' }
+  if (schema_evolution) requires.db.schema_evolution = schema_evolution
   await writeFile (package_json, JSON.stringify(conf,null,'  '))
   console.log (`/> ${ exists ? 'updated' : 'created' } ./package.json`)
 }

package/lib/import/odata/v4parser.js

@@ -112,7 +112,12 @@ function _isValidJSON(jsonObj, parserContext) {
 function _hasEntityContainer(jsonObj, parserContext) {
     let jsonObjEntityContainer = jsonObj.$EntityContainer;
     try {
-        if (jsonObjEntityContainer) [parserContext.namespace, parserContext.jsonEntityContainerName] = jsonObjEntityContainer.split('.');
+        if (jsonObjEntityContainer) {
+            // scenario: Schema Namespace="A.B.C.D" & jsonObjEntityContainer is "A.B.C.D.EntityContainerName"
+            let lastIndex = jsonObjEntityContainer.lastIndexOf('.');
+            parserContext.namespace = jsonObjEntityContainer.substring(0, lastIndex);
+            parserContext.jsonEntityContainerName = jsonObjEntityContainer.substring(lastIndex + 1);
+        }
         if (jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] &&
             jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] instanceof Object
         ) {