Merge branch 'DBTOOLS-2153_bug_parser_and_analyze' into 'master'

AXEPOH · AXEPOH · commit e58ec692a24c · 2026-07-30T15:41:39.000+03:00
DBTOOLS-2153 fixed bug parser and analyze

See merge request codekeeper/pgcodekeeper-core!299
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Disabled dependency analysis for objects that could not be parsed correctly, reducing the number of irrelevant errors displayed to the user.
+
 ### Fixed
 
 - Fixed a parsing error for the `ALTER SEQUENCE ... SET LOGGED/UNLOGGED` command for regular sequences in PostgreSQL.
diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md
@@ -21,6 +21,8 @@
 
 ### Изменено
 
+- Отключен анализ зависимостей объектов, которые не получилось правильно распарсить, что уменьшило количество нерелевантных ошибок, отображаемых пользователю.
+
 ### Исправлено
 
 - Исправлена ошибка парсинга команды `ALTER SEQUENCE ... SET LOGGED/UNLOGGED` для классических последовательностей в PostgreSQL.
diff --git a/src/main/java/org/pgcodekeeper/core/database/base/loader/AbstractJdbcLoader.java b/src/main/java/org/pgcodekeeper/core/database/base/loader/AbstractJdbcLoader.java
@@ -79,7 +79,9 @@ protected <P extends Parser, R> void submitAntlrTask(BiFunction<List<Object>, St
                 throw new MonitorCancelledRuntimeException();
             }
             setCurrentObject(object);
-            finalizer.accept(r);
+            if (list.isEmpty()) {
+                finalizer.accept(r);
+            }
         });
     }
 
diff --git a/src/main/java/org/pgcodekeeper/core/database/pg/parser/statement/PgCreateFunction.java b/src/main/java/org/pgcodekeeper/core/database/pg/parser/statement/PgCreateFunction.java
@@ -278,7 +278,10 @@ private void analyzeFunctionDefinition(PgAbstractFunction function, String langu
             AntlrTaskManager.submit(antlrTasks,
                     () -> PgParserUtils.createSqlParser(def, name, err, start).sql(),
                     funcCtx -> {
-                        errors.addAll(err);
+                        if (!err.isEmpty()) {
+                            errors.addAll(err);
+                            return;
+                        }
                         PgFuncProcAnalysisLauncher launcher = new PgFuncProcAnalysisLauncher(
                                 function, funcCtx, fileName, funcArgs, settings.isEnableFunctionBodiesDependencies());
                         launcher.setOffset(start);
@@ -292,7 +295,10 @@ private void analyzeFunctionDefinition(PgAbstractFunction function, String langu
                         return parser.plpgsql_function();
                     },
                     funcCtx -> {
-                        errors.addAll(err);
+                        if (!err.isEmpty()) {
+                            errors.addAll(err);
+                            return;
+                        }
                         PgFuncProcAnalysisLauncher launcher = new PgFuncProcAnalysisLauncher(
                                 function, funcCtx, fileName, funcArgs, settings.isEnableFunctionBodiesDependencies());
                         launcher.setOffset(start);
diff --git a/src/test/java/org/pgcodekeeper/core/database/pg/loader/PgDumpLoaderTest.java b/src/test/java/org/pgcodekeeper/core/database/pg/loader/PgDumpLoaderTest.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2017-2026 TAXTELECOM, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+
+package org.pgcodekeeper.core.database.pg.loader;
+
+import org.junit.jupiter.api.Test;
+import org.pgcodekeeper.core.TestUtils;
+import org.pgcodekeeper.core.database.pg.PgDatabaseProvider;
+import org.pgcodekeeper.core.settings.CoreSettings;
+
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class PgDumpLoaderTest {
+
+    @Test
+    void skipAddAnalysisLauncherTest() throws IOException, InterruptedException {
+        String resource = "broken_procedure.sql";
+        var settings = new CoreSettings();
+        settings.setEnableFunctionBodiesDependencies(true);
+        var l = new PgDatabaseProvider().getDumpLoader(TestUtils.getFilePath(resource, getClass()), settings);
+        var db = l.load();
+        assertFalse(l.getErrors().isEmpty());
+        assertTrue(db.getAnalysisLaunchers().isEmpty());
+    }
+}
diff --git a/src/test/java/org/pgcodekeeper/core/it/IntegrationTestUtils.java b/src/test/java/org/pgcodekeeper/core/it/IntegrationTestUtils.java
@@ -58,6 +58,13 @@ public static IDatabase loadTestDump(IDatabaseProvider databaseProvider, String
     public static IDatabase loadTestDump(IDatabaseProvider databaseProvider, String resource, Class<?> c,
                                          ISettings settings, boolean analysis)
             throws IOException, InterruptedException {
+                return loadTestDump(databaseProvider, resource, c, settings, analysis, false);
+    }
+
+
+    public static IDatabase loadTestDump(IDatabaseProvider databaseProvider, String resource, Class<?> c,
+                                         ISettings settings, boolean analysis, boolean hasErrors)
+            throws IOException, InterruptedException {
         InputStreamProvider input = () -> c.getResourceAsStream(resource);
         String inputObjectName = "test/" + c.getName() + '/' + resource;
 
@@ -68,7 +75,11 @@ public static IDatabase loadTestDump(IDatabaseProvider databaseProvider, String
             FullAnalyze.fullAnalyze(db, settings.getErrors(), settings.getVersion());
         }
 
-        TestUtils.assertErrors(settings.getErrors());
+        if (hasErrors) {
+            Assertions.assertFalse(settings.getErrors().isEmpty());
+        } else {
+            TestUtils.assertErrors(settings.getErrors());
+        }
         return db;
     }
 
diff --git a/src/test/java/org/pgcodekeeper/core/model/graph/pg/PgDepcyFinderTest.java b/src/test/java/org/pgcodekeeper/core/model/graph/pg/PgDepcyFinderTest.java
@@ -39,7 +39,7 @@ class PgDepcyFinderTest {
             "view, public.v1",
             }, useHeadersInDisplayName = true)
     void compareReverseGraph(String fileName, String objectName) throws IOException, InterruptedException {
-        compareGraph(fileName, FILES_POSTFIX.DEPS_REVERSE_TXT, objectName, true);
+        compareGraph(fileName, FILES_POSTFIX.DEPS_REVERSE_TXT, objectName, true, false);
     }
 
     @ParameterizedTest
@@ -64,19 +64,29 @@ void compareReverseGraph(String fileName, String objectName) throws IOException,
             "table_constraint, public.test_fk_1.fk",
             }, useHeadersInDisplayName = true)
     void compareBothGraph(String fileName, String objectName) throws IOException, InterruptedException {
-        compareGraph(fileName, FILES_POSTFIX.DEPS_TXT, objectName, false);
-        compareGraph(fileName, FILES_POSTFIX.DEPS_REVERSE_TXT, objectName, true);
+        compareGraph(fileName, FILES_POSTFIX.DEPS_TXT, objectName, false, false);
+        compareGraph(fileName, FILES_POSTFIX.DEPS_REVERSE_TXT, objectName, true, false);
     }
 
-    void compareGraph(String fileName, FILES_POSTFIX expectedPostfix, String objectName, boolean isReverse)
+    @ParameterizedTest
+    @CsvSource(value = {
+        "fileName, objectName",
+        "procedure_with_reserved_token, public.\"treat\""
+        }, useHeadersInDisplayName = true)
+    void compareBothGraphWithErrors(String fileName, String objectName) throws IOException, InterruptedException {
+        compareGraph(fileName, FILES_POSTFIX.DEPS_TXT, objectName, false, true);
+        compareGraph(fileName, FILES_POSTFIX.DEPS_REVERSE_TXT, objectName, true, true);
+    }
+
+    void compareGraph(String fileName, FILES_POSTFIX expectedPostfix, String objectName, boolean isReverse, boolean hasErrors)
             throws IOException, InterruptedException {
         var settings = new CoreSettings();
         PgDatabaseProvider databaseProvider = new PgDatabaseProvider();
 
         settings.setEnableFunctionBodiesDependencies(true);
 
         IDatabase db = IntegrationTestUtils.loadTestDump(databaseProvider, fileName + FILES_POSTFIX.SQL,
-                getClass(), settings);
+                getClass(), settings, true, hasErrors);
 
         var deps = DepcyFinder.byPatterns(10, isReverse, Collections.emptyList(), false, db, List.of(objectName));
         String actual = String.join("\n", deps);
diff --git a/src/test/resources/org/pgcodekeeper/core/database/pg/loader/broken_procedure.sql b/src/test/resources/org/pgcodekeeper/core/database/pg/loader/broken_procedure.sql
@@ -0,0 +1,17 @@
+CREATE OR REPLACE PROCEDURE public.lock_and_agg_items(p_id_1 integer, p_id_2 integer)
+    LANGUAGE plpgsql
+    AS $$
+DECLARE
+    _rows public.treat[];
+BEGIN
+    WITH locked_rows AS (
+        SELECT *
+        FROM public.treat
+        WHERE id IN (p_id_1, p_id_2)
+        FOR UPDATE
+    )
+    SELECT array_agg(x::public.treat)
+    INTO _rows
+    FROM locked_rows x;
+END;
+$$;
diff --git a/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token.sql b/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token.sql
@@ -0,0 +1,42 @@
+CREATE TYPE public."treat" AS (
+    id integer,
+    name text,
+    value numeric,
+    created_at timestamp
+);
+
+CREATE OR REPLACE PROCEDURE public.with_unquoted_token(p_id_1 integer, p_id_2 integer)
+    LANGUAGE plpgsql
+    AS $$
+DECLARE
+    _rows public.treat[];
+BEGIN
+    WITH locked_rows AS (
+        SELECT *
+        FROM public.treat
+        WHERE id IN (p_id_1, p_id_2)
+        FOR UPDATE
+    )
+    SELECT array_agg(x::public.treat)
+    INTO _rows
+    FROM locked_rows x;
+END;
+$$;
+
+CREATE OR REPLACE PROCEDURE public.with_quoted_token(p_id_1 integer, p_id_2 integer)
+    LANGUAGE plpgsql
+    AS $$
+DECLARE
+    _rows public."treat"[];
+BEGIN
+    WITH locked_rows AS (
+        SELECT *
+        FROM public."treat"
+        WHERE id IN (p_id_1, p_id_2)
+        FOR UPDATE
+    )
+    SELECT array_agg(x::public."treat")
+    INTO _rows
+    FROM locked_rows x;
+END;
+$$;
diff --git a/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token_deps.txt b/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token_deps.txt
@@ -0,0 +1,2 @@
+TYPE public."treat"
+	PROCEDURE public.with_quoted_token(integer, integer)
diff --git a/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token_deps_reverse.txt b/src/test/resources/org/pgcodekeeper/core/model/graph/pg/procedure_with_reserved_token_deps_reverse.txt
@@ -0,0 +1,2 @@
+TYPE public."treat"
+	SCHEMA public

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,9 @@ protected <P extends Parser, R> void submitAntlrTask(BiFunction<List<Object>, St`
`79`	`79`	`throw new MonitorCancelledRuntimeException();`
`80`	`80`	`}`
`81`	`81`	`setCurrentObject(object);`
`82`		`- finalizer.accept(r);`
	`82`	`+ if (list.isEmpty()) {`
	`83`	`+ finalizer.accept(r);`
	`84`	`+ }`
`83`	`85`	`});`
`84`	`86`	`}`
`85`	`87`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+TYPE public."treat"`
	`2`	`+ PROCEDURE public.with_quoted_token(integer, integer)`