Skip to content

Commit 1dcb220

Browse files
committed
Cleanup of MRS SQL generation
Change-Id: I3b6a1c5eea26a6c7769e66000db07c4c53dbddc6
1 parent 5467b77 commit 1dcb220

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

gui/frontend/src/modules/mrs/dialogs/MrsObjectFieldEditor.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export class MrsObjectFieldEditor extends ValueEditCustom<
308308
if (mrsObject) {
309309
view = `CREATE OR REPLACE REST DUALITY VIEW ${data.dbObject.requestPath}\n` +
310310
` ON SERVICE ${data.servicePath} SCHEMA ${data.dbSchemaPath}\n` +
311-
` AS ${data.dbSchemaName}.${data.dbObject.name} CLASS ${mrsObject.name} `;
311+
` AS ${data.dbSchemaName}.${data.dbObject.name} CLASS ${mrsObject.name}`;
312312

313313
for (const op of data.dbObject.crudOperations) {
314314
if (op === "CREATE") {
@@ -321,7 +321,7 @@ export class MrsObjectFieldEditor extends ValueEditCustom<
321321
}
322322

323323
if (mrsObject.fields) {
324-
view += ` {\n${cutLastComma(walk(mrsObject?.fields, undefined, 2))}\n }\n`;
324+
view += ` {\n${cutLastComma(walk(mrsObject?.fields, undefined, 2))}\n }`;
325325
}
326326

327327
view += addOptions(data.dbObject) + ";";
@@ -338,14 +338,15 @@ export class MrsObjectFieldEditor extends ValueEditCustom<
338338
` AS ${data.dbSchemaName}.${data.dbObject.name}`;
339339

340340
if (mrsObject.fields) {
341-
view += `\nPARAMETERS ${mrsObject.name} {\n` + walk(mrsObject?.fields).slice(0, -2) + "\n}";
341+
view += `\n PARAMETERS ${mrsObject.name} {\n` +
342+
walk(mrsObject?.fields, undefined, 2).slice(0, -2) + "\n }";
342343
}
343344

344345
for (const obj of data.mrsObjects) {
345346
if (obj.kind !== MrsObjectKind.Parameters) {
346347
if (obj.fields) {
347-
view += `\nRESULT ${obj.name} {\n`
348-
+ walk(obj.fields, undefined, undefined, true).slice(0, -2) + "\n}";
348+
view += `\n RESULT ${obj.name} {\n`
349+
+ walk(obj.fields, undefined, 2, true).slice(0, -2) + "\n }";
349350
}
350351
}
351352
}

mrs_plugin/lib/MrsDdlExecutor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,12 +1579,12 @@ def showCreateRestDbObject(self, mrs_object: dict):
15791579
session=self.session, object_id=object["id"])
15801580

15811581
children = cutLastComma(walk(
1582-
fields=fields, add_data_type=object["kind"] == "RESULT", current_object=db_object))
1582+
fields=fields, level=2, add_data_type=object["kind"] == "RESULT", current_object=db_object))
15831583

1584-
stmt += f'{object["kind"]} {object["name"]}'
1584+
stmt += f' {object["kind"]} {object["name"]}'
15851585

15861586
if children:
1587-
stmt += f" {{\n{children}\n}}\n"
1587+
stmt += f" {{\n{children}\n }}\n"
15881588

15891589
if db_object["enabled"] is False or db_object["enabled"] == 0:
15901590
stmt += " DISABLED\n"

0 commit comments

Comments
 (0)