Skip to content

Commit b7c3b14

Browse files
authored
Merge pull request IPdotSetAF#29 from IPdotSetAF/28-mssql-scaffolder-error
fixed mssql scaffolder bug
2 parents 7dea6b1 + c487f58 commit b7c3b14

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Frontend/src/app/mssql-scaffolder/mssql-scaffolder.component.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,18 @@ ${res.map((p) => `\tpublic ${MssqlScaffolderComponent.convertDataType(p.DataType
220220
ps = ps as GetSPParametersResponse[];
221221
this.scaffolder.getSPReturnColumns(this.connectionID, sc.database, sc.schema, sc.sp).subscribe(rs => {
222222
rs = rs as GetSPReturnColumnsResponse[];
223+
224+
const psc = ps.map((p) => `\tpublic ${MssqlScaffolderComponent.convertDataType(p.Type)}${p.Nullable ? '?' : ''} ${p.Parameter_name} { get; set; }`);
225+
const rsc = rs.map((p) => `\tpublic ${MssqlScaffolderComponent.convertDataType(p.system_type_name)}${p.Nullable ? '?' : ''} ${p.column} { get; set; }`);
226+
223227
this.csCode =
224-
`public class ${sc.sp}Params {
225-
${ps.map((p) => `\tpublic ${MssqlScaffolderComponent.convertDataType(p.Type)}${p.Nullable ? '?' : ''} ${p.Parameter_name} { get; set; }\n`).reduce((a, b) => a + b)}}
228+
`${psc.length > 0 ? `public class ${sc.sp}Params {`:'' }
229+
${psc.join("\n")}
230+
${psc.length > 0 ? '}':'' }
226231
227-
public class ${sc.sp}Result {
228-
${rs.map((p) => `\tpublic ${MssqlScaffolderComponent.convertDataType(p.system_type_name)}${p.Nullable ? '?' : ''} ${p.column} { get; set; }\n`).reduce((a, b) => a + b)}}`;
232+
${rsc.length>0? `public class ${sc.sp}Result {`:'' }
233+
${rsc.join("\n")}
234+
${rsc.length > 0 ? '}':'' }`;
229235
this.codeFlip = !this.codeFlip;
230236
});
231237
});

0 commit comments

Comments
 (0)