From d7dbd79f7cb010b52abfa6d277b6dccce632c176 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Thu, 25 Sep 2025 08:59:12 +0200 Subject: [PATCH] fixed loading structure for firebird --- plugins/dbgate-plugin-firebird/src/backend/Analyser.js | 2 +- plugins/dbgate-plugin-firebird/src/backend/helpers.js | 2 -- plugins/dbgate-plugin-firebird/src/backend/sql/functions.js | 2 +- plugins/dbgate-plugin-firebird/src/backend/sql/indexes.js | 2 +- plugins/dbgate-plugin-firebird/src/backend/sql/procedures.js | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/dbgate-plugin-firebird/src/backend/Analyser.js b/plugins/dbgate-plugin-firebird/src/backend/Analyser.js index 981db1788..bc4f756b3 100644 --- a/plugins/dbgate-plugin-firebird/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-firebird/src/backend/Analyser.js @@ -124,7 +124,7 @@ class Analyser extends DatabaseAnalyser { uniques: uniques.filter(unique => unique.pureName === table.pureName), indexes: indexes.filter(index => index.pureName === table.pureName), })) ?? []; - console.log(uniques); + // console.log(uniques); const views = viewsResults.rows?.map(view => ({ diff --git a/plugins/dbgate-plugin-firebird/src/backend/helpers.js b/plugins/dbgate-plugin-firebird/src/backend/helpers.js index 2d5d84872..6ec4e54fc 100644 --- a/plugins/dbgate-plugin-firebird/src/backend/helpers.js +++ b/plugins/dbgate-plugin-firebird/src/backend/helpers.js @@ -126,7 +126,5 @@ module.exports = { getTriggerTiming, getFormattedDefaultValue, getTriggerCreateSql, - blobStreamToString, - normalizeRow, createFirebirdInsertStream, }; diff --git a/plugins/dbgate-plugin-firebird/src/backend/sql/functions.js b/plugins/dbgate-plugin-firebird/src/backend/sql/functions.js index 087cec665..5d85962cb 100644 --- a/plugins/dbgate-plugin-firebird/src/backend/sql/functions.js +++ b/plugins/dbgate-plugin-firebird/src/backend/sql/functions.js @@ -4,7 +4,7 @@ SELECT TRIM(F.RDB$FUNCTION_NAME) AS "objectId", TRIM('FUNCTION') AS "objectTypeField", TRIM(F.RDB$DESCRIPTION) AS "objectComment", - F.RDB$FUNCTION_SOURCE AS "createSql", -- This is the PSQL body or definition for UDRs + CAST(SUBSTRING(F.RDB$FUNCTION_SOURCE FROM 1 FOR 5000) AS VARCHAR(5000)) AS "createSql", FALSE AS "requiresFormat" -- Assuming PSQL source is generally readable FROM RDB$FUNCTIONS F diff --git a/plugins/dbgate-plugin-firebird/src/backend/sql/indexes.js b/plugins/dbgate-plugin-firebird/src/backend/sql/indexes.js index e2797f22a..ab0d5382c 100644 --- a/plugins/dbgate-plugin-firebird/src/backend/sql/indexes.js +++ b/plugins/dbgate-plugin-firebird/src/backend/sql/indexes.js @@ -11,7 +11,7 @@ SELECT -- Index name, maps to pureName WHEN I.RDB$EXPRESSION_SOURCE IS NOT NULL THEN TRIM('expression') -- indexType: if an expression index [cite: 46, 262] ELSE TRIM('normal') END AS "indexType", - I.RDB$CONDITION_SOURCE AS "idx_filterDefinition", -- filterDefinition: for partial indexes [cite: 46, 261, 838] + -- I.RDB$CONDITION_SOURCE AS "idx_filterDefinition", -- filterDefinition: for partial indexes [cite: 46, 261, 838] COALESCE(I.RDB$INDEX_INACTIVE, 0) AS "idx_isInactive", -- 0 for active, 1 for inactive [cite: 46, 838] I.RDB$DESCRIPTION AS "idx_description", -- Index description/comment [cite: 46, 838] diff --git a/plugins/dbgate-plugin-firebird/src/backend/sql/procedures.js b/plugins/dbgate-plugin-firebird/src/backend/sql/procedures.js index 567101e61..878ea6987 100644 --- a/plugins/dbgate-plugin-firebird/src/backend/sql/procedures.js +++ b/plugins/dbgate-plugin-firebird/src/backend/sql/procedures.js @@ -3,7 +3,7 @@ SELECT TRIM(P.RDB$PROCEDURE_NAME) AS "pureName", TRIM('PROCEDURE') AS "objectTypeField", TRIM(P.RDB$DESCRIPTION) AS "objectComment", - P.RDB$PROCEDURE_SOURCE AS "createSql", -- Contains the PSQL body + CAST(SUBSTRING(P.RDB$PROCEDURE_SOURCE FROM 1 FOR 5000) AS VARCHAR(5000)) AS "createSql", FALSE AS "requiresFormat" FROM RDB$PROCEDURES P