Merge pull request #119 from SAP-samples/Feb2024

New sql append feature for table conversion and inspection

Author: jung-thomas

CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "date": "2024-02-16",
+        "version": "3.202402.2",
+        "Changed": [
+            "Mass Convert of Tables to CDS if you use Pure Catalog Definitions, it will output sql append content",
+            "Table inspect to CDS if you choose no Persistence Exists, it will output sql append content"
+
+        ]
+    },
     {
         "date": "2024-02-03",
         "version": "3.202402.1",

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [3.202402.2] - 2024-02-16
+
+**Changed**
+
+- Mass Convert of Tables to CDS if you use Pure Catalog Definitions, it will output sql append content
+- Table inspect to CDS if you choose no Persistence Exists, it will output sql append content
+
 ## [3.202402.1] - 2024-02-03
 
 **Changed**

bin/inspectTable.js

@@ -48,9 +48,9 @@ export const builder = base.getBuilder({
     default: false
   },
   noColons: {
-      type: 'boolean',
-      default: false,
-      desc: base.bundle.getText("noColons")
+    type: 'boolean',
+    default: false,
+    desc: base.bundle.getText("noColons")
   }
 })
 
@@ -86,7 +86,7 @@ export let inputPrompts = {
   noColons: {
     type: 'boolean',
     description: base.bundle.getText("noColons")
-}
+  }
 }
 
 export function handler(argv) {
@@ -100,7 +100,7 @@ export async function tableInspect(prompts) {
     import('json-to-pretty-yaml'),
     import('odata2openapi')
   ])
-  
+
   try {
     base.setPrompts(prompts)
     let dbConnection = await conn.createConnection(prompts, false)
@@ -153,6 +153,13 @@ export async function tableInspect(prompts) {
       }
       case 'cds': {
         let cdsSource = await dbInspect.formatCDS(db, object, fields, constraints, "table", schema, null)
+        if (!dbInspect.options.useExists) {
+          let output = await dbInspect.getDef(db, schema, prompts.table)
+          output = output.slice(7)
+          const lastParenthesisIndex = output.lastIndexOf(')')
+          const substringAfterLastParenthesis = output.substring(lastParenthesisIndex + 1)
+          cdsSource = `@sql.append: \`\`\`sql \n${substringAfterLastParenthesis}\n\`\`\`\n${cdsSource}`
+        }
         results.cds = cdsSource
         console.log(highlight(cdsSource))
         break

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hana-cli",
-  "version": "3.202402.1",
+  "version": "3.202402.2",
   "description": "HANA Developer Command Line Interface",
   "main": "index.js",
   "bin": {

utils/massConvert.js

@@ -205,7 +205,7 @@ async function hdbtableViews(prompts, viewResults, wss, db, schema, replacer, zi
             let object = await dbInspect.getView(db, schema, view.VIEW_NAME)
             let fields = []
             if (await dbInspect.isCalculationView(db, schema, view.VIEW_NAME)) {
-                fields = await dbInspect.getCalcViewFields(db, schema, view.VIEW_NAME, object[0].VIEW_OID)                
+                fields = await dbInspect.getCalcViewFields(db, schema, view.VIEW_NAME, object[0].VIEW_OID)
             } else {
                 fields = await dbInspect.getViewFields(db, object[0].VIEW_OID)
             }
@@ -358,6 +358,13 @@ async function cdsTables(prompts, results, wss, db, schema, cdsSource, logOutput
             let constraints = await dbInspect.getConstraints(db, object)
             cdsSource += await dbInspect.formatCDS(db, object, fields, constraints, "table", schema, null) + '\n'
 
+            if (dbInspect.options.userCatalogPure) {
+                let output = await dbInspect.getDef(db, schema, table.TABLE_NAME)
+                output = output.slice(7)
+                const lastParenthesisIndex = output.lastIndexOf(')')
+                const substringAfterLastParenthesis = output.substring(lastParenthesisIndex + 1)
+                cdsSource = `@sql.append: \`\`\`sql \n${substringAfterLastParenthesis}\n\`\`\`\n${cdsSource}`
+            }
             progressBar.itemDone(table.TABLE_NAME)
             logOutput.push({ object: table.TABLE_NAME, status: 'Success' })
         }
@@ -405,7 +412,7 @@ async function cdsViews(prompts, viewResults, wss, db, schema, cdsSource, logOut
                 parameters = await dbInspect.getCalcViewParameters(db, schema, view.VIEW_NAME, object[0].VIEW_OID)
             } else {
                 fields = await dbInspect.getViewFields(db, object[0].VIEW_OID)
-                parameters = await  dbInspect.getViewParameters(db, object[0].VIEW_OID)
+                parameters = await dbInspect.getViewParameters(db, object[0].VIEW_OID)
             }
             cdsSource += await dbInspect.formatCDS(db, object, fields, null, "view", schema, null, parameters)
 
@@ -561,6 +568,7 @@ export async function convert(wss) {
         dbInspect.options.useExists = prompts.useExists
         dbInspect.options.useQuoted = prompts.useQuoted
         dbInspect.options.log = prompts.log
+        dbInspect.options.userCatalogPure = prompts.useCatalogPure
 
 
         let logOutput = []
@@ -609,7 +617,7 @@ export async function convert(wss) {
                     prompts, viewResults, wss, db, schema, cdsSource, logOutput
                 )
                 await writeCDS(prompts, wss, cdsSource, logOutput)
-                await writeSynonyms(prompts, wss)                
+                await writeSynonyms(prompts, wss)
                 break
             }
         }