dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-27 05:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #953 from dbgate/featrue/callable-templates

Browse Source 
feat: myssql callable template
This commit is contained in:
Jan Prochazka
2024-12-05 15:40:43 +01:00
committed by GitHub
parent ba706b85d3 e231a3a41a
commit 05b044d965
5 changed files with 96 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/types/dbinfo.d.ts vendored
View File

@@ -132,7 +132,9 @@ export interface CallableObjectInfo extends SqlObjectInfo {
export interface ProcedureInfo extends CallableObjectInfo {} export interface ProcedureInfo extends CallableObjectInfo {}
export interface FunctionInfo extends CallableObjectInfo {} export interface FunctionInfo extends CallableObjectInfo {
returnType?: string;
}
export interface TriggerInfo extends SqlObjectInfo {} export interface TriggerInfo extends SqlObjectInfo {}

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

@@ -219,7 +219,7 @@
return null; return null;
} }
return { ...driver.getQuerySplitterOptions('editor'), queryParameterStyle }; return { ...driver.getQuerySplitterOptions('editor'), queryParameterStyle, allowDollarDollarString: false };
} }
async function executeCore(sql, startLine = 0) { async function executeCore(sql, startLine = 0) {

40
plugins/dbgate-plugin-mysql/src/frontend/Dumper.js
View File

@@ -97,6 +97,46 @@ class Dumper extends SqlDumper {
selectScopeIdentity() { selectScopeIdentity() {
this.put('^select ^last_insert_id()'); this.put('^select ^last_insert_id()');
} }
callableTemplate(func) {
const parameters = (func.parameters || []).filter(x => x.parameterMode != 'RETURN');
const putParameters = (parameters, delimiter) => {
this.putCollection(delimiter, parameters || [], param => {
if (param.parameterMode == 'IN') {
this.putRaw('@' + param.parameterName);
} else {
this.putRaw('@' + param.parameterName + 'Output');
}
});
};
const putSetParamters = parameters => {
for (const param of parameters || []) {
if (param.parameterMode == 'IN') {
this.put('SET @%s = :%s', param.parameterName, param.parameterName);
this.endCommand();
}
}
this.put('&n');
};
if (func.objectTypeField == 'procedures') {
putSetParamters(func.parameters);
this.put('^call %f(&>&n', func);
putParameters(parameters, ',&n');
this.put('&<&n)');
this.endCommand();
}
if (func.objectTypeField == 'functions') {
putSetParamters(parameters);
this.put('^select %f(&>&n', func);
putParameters(parameters, ',&n');
this.put('&<&n)');
this.endCommand();
}
}
} }
module.exports = Dumper; module.exports = Dumper;

1
plugins/dbgate-plugin-postgres/src/backend/Analyser.js
View File

@@ -346,6 +346,7 @@ class Analyser extends DatabaseAnalyser {
schemaName: func.schema_name, schemaName: func.schema_name,
contentHash: func.hash_code, contentHash: func.hash_code,
parameters: functionNameToParameters[`${func.schema_name}.${func.pure_name}`], parameters: functionNameToParameters[`${func.schema_name}.${func.pure_name}`],
returnType: func.data_type,
})), })),
}; };

51
plugins/dbgate-plugin-postgres/src/frontend/Dumper.js
View File

@@ -109,6 +109,57 @@ class Dumper extends SqlDumper {
const column = table.columns && table.columns.find(x => x.autoIncrement); const column = table.columns && table.columns.find(x => x.autoIncrement);
this.put("^SELECT currval(pg_get_serial_sequence('%f','%s'))", table, column ? column.columnName : null); this.put("^SELECT currval(pg_get_serial_sequence('%f','%s'))", table, column ? column.columnName : null);
} }
callableTemplate(func) {
const putDeclareParamters = parameters => {
for (const param of parameters.filter(i => i.parameterMode != 'RETURN')) {
if (param.parameterMode == 'IN') {
this.put('%s %s := :%s', param.parameterName, param.dataType, param.parameterName);
this.endCommand();
} else {
this.put('%s %s', param.parameterName, param.dataType);
this.endCommand();
}
}
this.put('&n');
};
const putParameters = (parameters, delimiter) => {
this.putCollection(delimiter, parameters || [], param => {
this.putRaw(param.parameterName);
});
};
if (func.objectTypeField == 'procedures') {
this.put('^do $$&n');
this.put('^declare&n');
putDeclareParamters(func.parameters);
this.put('^begin&n');
this.put('^call %f(&>&n', func);
putParameters(func.parameters, ',&n');
this.put('&<&n)');
this.endCommand();
this.put('&n');
this.put('^end $$');
this.endCommand();
}
if (func.objectTypeField == 'functions') {
this.put('^do $$&n');
this.put('^declare&n');
this.put('result %s', func.returnType);
this.endCommand();
putDeclareParamters(func.parameters);
this.put('^begin&n');
this.put('result := %f(&>&n', func);
putParameters(func.parameters, ',&n');
this.put('&<&n)');
this.endCommand();
this.put('&n');
this.put('^end $$');
this.endCommand();
}
}
} }
module.exports = Dumper; module.exports = Dumper;