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

removed schemaName from mysql

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-12-04 10:23:16 +01:00
parent 5cc4c07941
commit 462d5e3187
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/dbgate-plugin-mysql/src/backend/Analyser.js
View File

@@ -135,9 +135,9 @@ class Analyser extends DatabaseAnalyser {
const functionParameters = parameters.rows.filter(x => x.routineType == 'FUNCTION'); const functionParameters = parameters.rows.filter(x => x.routineType == 'FUNCTION');
const functionNameToParameters = functionParameters.reduce((acc, row) => { const functionNameToParameters = functionParameters.reduce((acc, row) => {
if (!acc[`${row.schemaName}.${row.pureName}`]) acc[`${row.schemaName}.${row.pureName}`] = []; if (!acc[row.pureName]) acc[row.pureName] = [];
acc[`${row.schemaName}.${row.pureName}`].push({ acc[row.pureName].push({
...row, ...row,
dataType: normalizeTypeName(row.dataType), dataType: normalizeTypeName(row.dataType),
}); });
@@ -146,9 +146,9 @@ class Analyser extends DatabaseAnalyser {
const procedureParameters = parameters.rows.filter(x => x.routineType == 'PROCEDURE'); const procedureParameters = parameters.rows.filter(x => x.routineType == 'PROCEDURE');
const procedureNameToParameters = procedureParameters.reduce((acc, row) => { const procedureNameToParameters = procedureParameters.reduce((acc, row) => {
if (!acc[`${row.schemaName}.${row.pureName}`]) acc[`${row.schemaName}.${row.pureName}`] = []; if (!acc[row.pureName]) acc[row.pureName] = [];
acc[`${row.schemaName}.${row.pureName}`].push({ acc[row.pureName].push({
...row, ...row,
dataType: normalizeTypeName(row.dataType), dataType: normalizeTypeName(row.dataType),
}); });
@@ -212,29 +212,29 @@ class Analyser extends DatabaseAnalyser {
})), })),
procedures: programmables.rows procedures: programmables.rows
.filter(x => x.objectType == 'PROCEDURE') .filter(x => x.objectType == 'PROCEDURE')
.map(x => _.omit(x, ['objectType', 'schemaName'])) .map(x => _.omit(x, ['objectType']))
.map(x => ({ .map(x => ({
...x, ...x,
createSql: `DELIMITER //\n\nCREATE PROCEDURE \`${x.pureName}\`(${getParametersSqlString( createSql: `DELIMITER //\n\nCREATE PROCEDURE \`${x.pureName}\`(${getParametersSqlString(
procedureNameToParameters[`${x.schemaName}.${x.pureName}`] procedureNameToParameters[x.pureName]
)})\n${x.routineDefinition}\n\nDELIMITER ;\n`, )})\n${x.routineDefinition}\n\nDELIMITER ;\n`,
objectId: x.pureName, objectId: x.pureName,
contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate, contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate,
parameters: procedureNameToParameters[`${x.schemaName}.${x.pureName}`], parameters: procedureNameToParameters[x.pureName],
})), })),
functions: programmables.rows functions: programmables.rows
.filter(x => x.objectType == 'FUNCTION') .filter(x => x.objectType == 'FUNCTION')
.map(x => _.omit(x, ['objectType', 'schemaName'])) .map(x => _.omit(x, ['objectType']))
.map(x => ({ .map(x => ({
...x, ...x,
createSql: `CREATE FUNCTION \`${x.pureName}\`(${getParametersSqlString( createSql: `CREATE FUNCTION \`${x.pureName}\`(${getParametersSqlString(
functionNameToParameters[`${x.schemaName}.${x.pureName}`]?.filter(i => i.parameterMode !== 'RETURN') functionNameToParameters[x.pureName]?.filter(i => i.parameterMode !== 'RETURN')
)})\nRETURNS ${x.returnDataType} ${x.isDeterministic == 'YES' ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}\n${ )})\nRETURNS ${x.returnDataType} ${x.isDeterministic == 'YES' ? 'DETERMINISTIC' : 'NOT DETERMINISTIC'}\n${
x.routineDefinition x.routineDefinition
}`, }`,
objectId: x.pureName, objectId: x.pureName,
contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate, contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate,
parameters: functionNameToParameters[`${x.schemaName}.${x.pureName}`], parameters: functionNameToParameters[x.pureName],
})), })),
}; };
this.feedback({ analysingMessage: null }); this.feedback({ analysingMessage: null });

1
plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
View File

@@ -1,6 +1,5 @@
module.exports = ` module.exports = `
select select
ROUTINE_SCHEMA AS schemaName,
ROUTINE_NAME as pureName, ROUTINE_NAME as pureName,
ROUTINE_TYPE as objectType, ROUTINE_TYPE as objectType,
COALESCE(LAST_ALTERED, CREATED) as modifyDate, COALESCE(LAST_ALTERED, CREATED) as modifyDate,