dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-29 08:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-12-04 14:15:13 +01:00
parent 9029fccad4
commit 6f4a49ea97
5 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/tools/src/SqlDumper.ts
View File

@@ -784,12 +784,17 @@ export class SqlDumper implements AlterProcessor {
}
}
declareVariable(name: string, type: string, defaultValueLiteral?: string) {}
executeCallable(func: CallableObjectInfo, argLiteralsByName: { [name: string]: string }) {
this.putCmd(
'^call %f(%,s)',
callableTemplate(func: CallableObjectInfo) {
this.put(
'^call %f(&>&n',
func,
(func.parameters || []).map(x => argLiteralsByName[x.parameterName])
);
this.putCollection(',&n', func.parameters || [], param => {
this.putRaw(param.parameterMode == 'IN' ? ':' + param.parameterName : param.parameterName);
});
this.put('&<&n');
this.endCommand();
}
}

3
packages/types/dumper.d.ts vendored
View File

@@ -17,8 +17,7 @@ export interface SqlDumper extends AlterProcessor {
createDatabase(name: string);
dropDatabase(name: string);
declareVariable(name: string, type: string, defaultValueLiteral?: string);
executeCallable(func: CallableObjectInfo, argLiteralsByName: { [name: string]: string });
callableTemplate(func: CallableObjectInfo);
endCommand();
allowIdentityInsert(table: NamedObjectInfo, allow: boolean);

2
packages/web/src/tabs/QueryTab.svelte
View File

@@ -419,7 +419,7 @@
let queryParameterStyle =
localStorage.getItem(`tabdata_queryParamStyle_${tabid}`) ??
initialArgs?.queryParameterStyle ??
(initialArgs?.scriptTemplate == 'EXECUTE PROCEDURE' || initialArgs?.scriptTemplate == 'CALL FUNCTION' ? ':' : null);
(initialArgs?.scriptTemplate == 'CALL OBJECT' ? ':' : null);
</script>
<ToolStripContainer bind:this={domToolStrip}>

22
packages/web/src/utility/applyScriptTemplate.ts
View File

@@ -70,29 +70,15 @@ export default async function applyScriptTemplate(
return createSql.replace(/^\s*create\s+/i, alterPrefix);
}
}
if (scriptTemplate == 'EXECUTE PROCEDURE' || scriptTemplate == 'CALL FUNCTION') {
if (scriptTemplate == 'CALL OBJECT') {
const procedureInfo = dbinfo ? extractDbObjectInfo(dbinfo, props) : await getSqlObjectInfo(props);
const connection = connectionInfo || (await getConnectionInfo(props));
const driver = findEngineDriver(connection, extensions) || driverBase;
const dmp = driver.createDumper();
if (procedureInfo) {
const argLiteralsByName = {};
for (const param of procedureInfo.parameters || []) {
const sqlVarName = param.parameterName?.startsWith('@')
? param.parameterName?.substring(1)
: param.parameterName;
dmp.declareVariable(
param.parameterName,
param.dataType,
param.parameterMode == 'OUT' ? null : `:${sqlVarName}`
);
argLiteralsByName[param.parameterName] = param.parameterName;
}
dmp.executeCallable(procedureInfo, argLiteralsByName);
dmp.callableTemplate(procedureInfo);
}
// if (procedureInfo) dmp.put('^execute %f', procedureInfo);
return dmp.s;
}
@@ -161,7 +147,7 @@ export function getSupportedScriptTemplates(objectTypeField: string): { label: s
},
{
label: 'EXECUTE',
scriptTemplate: 'EXECUTE PROCEDURE',
scriptTemplate: 'CALL OBJECT',
},
];
@@ -177,7 +163,7 @@ export function getSupportedScriptTemplates(objectTypeField: string): { label: s
},
{
label: 'CALL',
scriptTemplate: 'CALL FUNCTION',
scriptTemplate: 'CALL OBJECT',
},
];
}