From a89d2e13653ac6aa68dd75e5093e7526edb36232 Mon Sep 17 00:00:00 2001 From: Nybkox Date: Thu, 28 Nov 2024 10:58:37 +0100 Subject: [PATCH] fix: add missing conditions for mssql parameters queries --- .../src/backend/sql/functionParameters.js | 6 +++++- .../src/backend/sql/proceduresParameters.js | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/dbgate-plugin-mssql/src/backend/sql/functionParameters.js b/plugins/dbgate-plugin-mssql/src/backend/sql/functionParameters.js index 75e94af53..1d1d98297 100644 --- a/plugins/dbgate-plugin-mssql/src/backend/sql/functionParameters.js +++ b/plugins/dbgate-plugin-mssql/src/backend/sql/functionParameters.js @@ -14,13 +14,17 @@ SELECT p.precision AS precision, p.scale AS scale, p.is_output AS isOutputParameter, - p.parameter_id AS parameterIndex + p.parameter_id AS parameterIndex, + s.name as schemaName FROM sys.objects o JOIN sys.parameters p ON o.object_id = p.object_id +INNER JOIN + sys.schemas s ON s.schema_id=o.schema_id WHERE o.type IN ('FN', 'IF', 'TF') + and o.object_id =OBJECT_ID_CONDITION and s.name =SCHEMA_NAME_CONDITION ORDER BY p.object_id, p.parameter_id; diff --git a/plugins/dbgate-plugin-mssql/src/backend/sql/proceduresParameters.js b/plugins/dbgate-plugin-mssql/src/backend/sql/proceduresParameters.js index b7be370cd..14fe6c96a 100644 --- a/plugins/dbgate-plugin-mssql/src/backend/sql/proceduresParameters.js +++ b/plugins/dbgate-plugin-mssql/src/backend/sql/proceduresParameters.js @@ -10,12 +10,16 @@ SELECT p.scale AS scale, p.is_output AS isOutputParameter, p.parameter_id AS parameterIndex + s.name as schemaName FROM sys.objects o JOIN sys.parameters p ON o.object_id = p.object_id +INNER JOIN + sys.schemas s ON s.schema_id=o.schema_id WHERE o.type = 'P' + and o.object_id =OBJECT_ID_CONDITION and s.name =SCHEMA_NAME_CONDITION ORDER BY o.object_id, p.parameter_id;