Support Partition Options in inspectTable and massConvert

Author: jung-thomas

bin/inspectTable.js

@@ -152,16 +152,14 @@ export async function tableInspect(prompts) {
         break
       }
       case 'cds': {
-        let cdsSource = await dbInspect.formatCDS(db, object, fields, constraints, "table", schema, null)
+        let cdsSource = ""
         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)
-          if (substringAfterLastParenthesis && substringAfterLastParenthesis !== "") {
-            cdsSource = `@sql.append: \`\`\`sql \n${substringAfterLastParenthesis}\n\`\`\`\n${cdsSource}`
-          }
+          cdsSource = dbInspect.parseSQLOptions(output, cdsSource)
         }
+        cdsSource += await dbInspect.formatCDS(db, object, fields, constraints, "table", schema, null)
+
         results.cds = cdsSource
         console.log(highlight(cdsSource))
         break

npm-shrinkwrap.json

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

package.json

@@ -913,3 +913,33 @@ export async function getGeoColumns(db, object, field, type) {
 	const geoColumns = await db.statementExecPromisified(statement, [object.SCHEMA_NAME, name, field.COLUMN_NAME])
 	return geoColumns[0].SRS_ID
 }
+
+
+export function parseSQLOptions(output, cdsSource){
+	// Define a regular expression to match the extended syntax
+	const extendedSyntaxRegex = /(?:UNLOAD PRIORITY \d+|AUTO MERGE|NO AUTO MERGE|GROUP TYPE "[^"]*"|GROUP SUBTYPE "[^"]*"|GROUP NAME "[^"]*"|GROUP LEAD|GROUP SUBTYPE "[^"]*"\))/gi
+	// Find the index of PARTITION statement
+	let partitionIndex = output.indexOf('PARTITION')
+	let partitionStatement
+	// Check if PARTITION is found
+	if (partitionIndex !== -1) {
+		// Find the index of the ';' character
+		let semicolonIndex = output.indexOf(';', partitionIndex)
+		// Extract the PARTITION statement
+		partitionStatement = semicolonIndex !== -1 ? output.substring(partitionIndex, semicolonIndex + 1) : output.substring(partitionIndex)
+	}
+	// Extract extended syntax using regex
+	const extendedSyntax = output.match(extendedSyntaxRegex)
+	if (extendedSyntax || partitionStatement) {
+		cdsSource += `@sql.append: \`\`\`sql \n`
+		for (let index = 0; index < extendedSyntax.length; index++) {
+			const element = extendedSyntax[index]
+			cdsSource += `${element}\n`
+		}
+		if (partitionStatement) {
+			cdsSource += `${partitionStatement}\n`
+		}
+		cdsSource += `\`\`\`\n`
+	}
+	return cdsSource
+}

utils/dbInspect.js

@@ -359,15 +359,9 @@ async function cdsTables(prompts, results, wss, db, schema, cdsSource, logOutput
             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)
-                if(substringAfterLastParenthesis && substringAfterLastParenthesis !== ""){
-                    cdsSource += `@sql.append: \`\`\`sql \n${substringAfterLastParenthesis}\n\`\`\`\n`
-                }
+                cdsSource = dbInspect.parseSQLOptions(output, cdsSource)
             }
             cdsSource += await dbInspect.formatCDS(db, object, fields, constraints, "table", schema, null) + '\n'
-
-           
             progressBar.itemDone(table.TABLE_NAME)
             logOutput.push({ object: table.TABLE_NAME, status: 'Success' })
         }