From 462d5e3187ddcc344095acb4a4fe8eec9d8aad97 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Wed, 4 Dec 2024 10:23:16 +0100
Subject: [PATCH] removed schemaName from mysql

---
 .../src/backend/Analyser.js                   | 20 +++++++++----------
 .../src/backend/sql/programmables.js          |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
index 82b8cebeb..1ff963894 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
@@ -135,9 +135,9 @@ class Analyser extends DatabaseAnalyser {
 
     const functionParameters = parameters.rows.filter(x => x.routineType == 'FUNCTION');
     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,
         dataType: normalizeTypeName(row.dataType),
       });
@@ -146,9 +146,9 @@ class Analyser extends DatabaseAnalyser {
 
     const procedureParameters = parameters.rows.filter(x => x.routineType == 'PROCEDURE');
     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,
         dataType: normalizeTypeName(row.dataType),
       });
@@ -212,29 +212,29 @@ class Analyser extends DatabaseAnalyser {
       })),
       procedures: programmables.rows
         .filter(x => x.objectType == 'PROCEDURE')
-        .map(x => _.omit(x, ['objectType', 'schemaName']))
+        .map(x => _.omit(x, ['objectType']))
         .map(x => ({
           ...x,
           createSql: `DELIMITER //\n\nCREATE PROCEDURE \`${x.pureName}\`(${getParametersSqlString(
-            procedureNameToParameters[`${x.schemaName}.${x.pureName}`]
+            procedureNameToParameters[x.pureName]
           )})\n${x.routineDefinition}\n\nDELIMITER ;\n`,
           objectId: x.pureName,
           contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate,
-          parameters: procedureNameToParameters[`${x.schemaName}.${x.pureName}`],
+          parameters: procedureNameToParameters[x.pureName],
         })),
       functions: programmables.rows
         .filter(x => x.objectType == 'FUNCTION')
-        .map(x => _.omit(x, ['objectType', 'schemaName']))
+        .map(x => _.omit(x, ['objectType']))
         .map(x => ({
           ...x,
           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${
             x.routineDefinition
           }`,
           objectId: x.pureName,
           contentHash: _.isDate(x.modifyDate) ? x.modifyDate.toISOString() : x.modifyDate,
-          parameters: functionNameToParameters[`${x.schemaName}.${x.pureName}`],
+          parameters: functionNameToParameters[x.pureName],
         })),
     };
     this.feedback({ analysingMessage: null });
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js b/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
index 588c04012..f6442fcc1 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
@@ -1,6 +1,5 @@
 module.exports = `
 select 
-    ROUTINE_SCHEMA AS schemaName,
     ROUTINE_NAME as pureName,
     ROUTINE_TYPE as objectType,
     COALESCE(LAST_ALTERED, CREATED) as modifyDate,