Merge branch 'DBTOOLS-2044_add_setting_ignore_not_null_name' into 'master'

AXEPOH · AXEPOH · commit e2a1095043ae · 2026-04-15T11:45:39.000+03:00
DBTOOLS-2044 added setting isDisableNameForNotNullConstraint

See merge request codekeeper/pgcodekeeper-core!258
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 /.classpath
 /.idea
 /.settings
+/.vscode
 /gen
 /target
 /bin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Added automatic reading of the .pgcodekeeperdependencies file with additional dependencies when loading a project.
+- Added option to simplify reading of NOT NULL constraints via JDBC for PostgreSQL 18+.
 
 ### Changed
 
diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md
@@ -10,6 +10,7 @@
 ### Добавлено
 
 - Добавлено автоматическое чтение файла .pgcodekeeperdependencies с дополнительными зависимостями при загрузке проекта.
+- Добавлена опция для упрощенного чтения ограничений NOT NULL через JDBC для PostgreSQL 18+.
 
 ### Изменено
 
diff --git a/src/main/java/org/pgcodekeeper/core/database/pg/jdbc/PgConstraintsReader.java b/src/main/java/org/pgcodekeeper/core/database/pg/jdbc/PgConstraintsReader.java
@@ -134,10 +134,15 @@ private void readNotNullConstraint(ResultSet res, PgAbstractTable table,
             }
         }
 
-        var notNullConstraint = new PgConstraintNotNull(constraintName);
-        notNullConstraint.setNoInherit(res.getBoolean("connoinherit"));
-        notNullConstraint.setNotValid(!res.getBoolean("convalidated"));
-        loader.setComment(notNullConstraint, res);
+        PgConstraintNotNull notNullConstraint;
+        if (loader.getSettings().isSimplifyNotNull()) {
+            notNullConstraint =  new PgConstraintNotNull(table.getName(), columnName);
+        } else {
+            notNullConstraint = new PgConstraintNotNull(constraintName);
+            notNullConstraint.setNoInherit(res.getBoolean("connoinherit"));
+            notNullConstraint.setNotValid(!res.getBoolean("convalidated"));
+            loader.setComment(notNullConstraint, res);
+        }
 
         column.setNotNullConstraint(notNullConstraint);
         notNullConstraint.setParent(column);
diff --git a/src/main/java/org/pgcodekeeper/core/settings/CoreSettings.java b/src/main/java/org/pgcodekeeper/core/settings/CoreSettings.java
@@ -35,6 +35,7 @@ public class CoreSettings implements ISettings {
     private boolean ignorePrivileges;
     private boolean keepNewlines;
     private boolean simplifyView;
+    private boolean simplifyNotNull;
     private boolean addTransaction;
     private boolean disableCheckFunctionBodies;
     private boolean enableFunctionBodiesDependencies;
@@ -226,6 +227,15 @@ public void setSimplifyView(boolean simplifyView) {
         this.simplifyView = simplifyView;
     }
 
+    @Override
+    public boolean isSimplifyNotNull() {
+        return simplifyNotNull;
+    }
+
+    public void setSimplifyNotNull(boolean simplifyNotNull) {
+        this.simplifyNotNull = simplifyNotNull;
+    }
+
     @Override
     public boolean isDisableCheckFunctionBodies() {
         return disableCheckFunctionBodies;
@@ -348,6 +358,7 @@ public CoreSettings copy() {
         settings.preFilePath = preFilePath;
         settings.selectedOnly = selectedOnly;
         settings.simplifyView = simplifyView;
+        settings.simplifyNotNull = simplifyNotNull;
         settings.stopNotAllowed = stopNotAllowed;
         settings.timeZone = timeZone;
         settings.printUsing = printUsing;
diff --git a/src/main/java/org/pgcodekeeper/core/settings/ISettings.java b/src/main/java/org/pgcodekeeper/core/settings/ISettings.java
@@ -153,6 +153,13 @@ public interface ISettings {
      */
     boolean isSimplifyView();
 
+    /**
+     * Checks if not null CONSTRAINT should be simplified.
+     *
+     * @return true if not null CONSTRAINT simplification is enabled
+     */
+    boolean isSimplifyNotNull();
+
     /**
      * Checks if function body checking should be disabled.
      *
diff --git a/src/test/java/org/pgcodekeeper/core/it/jdbc/base/JdbcLoaderTest.java b/src/test/java/org/pgcodekeeper/core/it/jdbc/base/JdbcLoaderTest.java
@@ -23,7 +23,6 @@
 import org.pgcodekeeper.core.database.base.jdbc.JdbcRunner;
 import org.pgcodekeeper.core.database.base.parser.ScriptParser;
 import org.pgcodekeeper.core.monitor.NullMonitor;
-import org.pgcodekeeper.core.settings.CoreSettings;
 import org.pgcodekeeper.core.settings.DiffSettings;
 import org.pgcodekeeper.core.utils.InputStreamProvider;
 
@@ -36,9 +35,8 @@ public abstract class JdbcLoaderTest {
 
     public static final String CLEAN_DB_SCRIPT = "clean db script";
 
-    protected void clearDb(CoreSettings settings, IDatabase startConfDb,
-                           IJdbcConnector connector, String url, IDatabaseProvider databaseProvider,
-                           DiffSettings diffSettings)
+    protected void clearDb(IDatabase startConfDb, IJdbcConnector connector, String url,
+                           IDatabaseProvider databaseProvider, DiffSettings diffSettings)
             throws IOException, InterruptedException, SQLException {
         var oldDb = databaseProvider.getJdbcLoader(url, diffSettings).loadAndAnalyze();
         var dropScript = PgCodeKeeperApi.diff(databaseProvider, oldDb, startConfDb, diffSettings);
diff --git a/src/test/java/org/pgcodekeeper/core/it/jdbc/ch/ChJdbcLoaderTest.java b/src/test/java/org/pgcodekeeper/core/it/jdbc/ch/ChJdbcLoaderTest.java
@@ -21,7 +21,6 @@
 import org.pgcodekeeper.core.FILES_POSTFIX;
 import org.pgcodekeeper.core.TestUtils;
 import org.pgcodekeeper.core.api.PgCodeKeeperApi;
-import org.pgcodekeeper.core.database.api.IDatabaseProvider;
 import org.pgcodekeeper.core.database.api.jdbc.IJdbcConnector;
 import org.pgcodekeeper.core.database.base.jdbc.JdbcRunner;
 import org.pgcodekeeper.core.database.base.loader.AbstractDumpLoader;
@@ -33,7 +32,6 @@
 import org.pgcodekeeper.core.monitor.NullMonitor;
 import org.pgcodekeeper.core.settings.CoreSettings;
 import org.pgcodekeeper.core.settings.DiffSettings;
-import org.pgcodekeeper.core.settings.ISettings;
 import org.pgcodekeeper.core.utils.InputStreamProvider;
 import org.pgcodekeeper.core.utils.testcontainer.TestContainerType;
 
@@ -86,7 +84,7 @@ void chJdbcLoaderTest(String fileName) throws Exception {
             var actual = PgCodeKeeperApi.diff(databaseProvider, dumpDb, remoteDb, diffSettings);
             Assertions.assertEquals("", actual, "Incorrect run dump %s on Database".formatted(dumpFileName));
         } finally {
-            clearDb(settings, startConfDb, connector, url, databaseProvider, diffSettings);
+            clearDb(startConfDb, connector, url, databaseProvider, diffSettings);
         }
     }
 
diff --git a/src/test/java/org/pgcodekeeper/core/it/jdbc/ms/MsJdbcLoaderTest.java b/src/test/java/org/pgcodekeeper/core/it/jdbc/ms/MsJdbcLoaderTest.java
@@ -107,7 +107,7 @@ private void jdbcLoaderTest(String dumpFileName, String url, CoreSettings settin
             var actual = PgCodeKeeperApi.diff(databaseProvider, dumpDb, remoteDb, diffSettings);
             Assertions.assertEquals("", actual, "Incorrect run dump %s on Database".formatted(dumpFileName));
         } finally {
-            clearDb(settings, startConfDb, connector, url, databaseProvider, diffSettings);
+            clearDb(startConfDb, connector, url, databaseProvider, diffSettings);
         }
     }
 
diff --git a/src/test/java/org/pgcodekeeper/core/it/jdbc/pg/PgGpJdbcLoaderTest.java b/src/test/java/org/pgcodekeeper/core/it/jdbc/pg/PgGpJdbcLoaderTest.java
@@ -21,14 +21,12 @@
 import org.pgcodekeeper.core.FILES_POSTFIX;
 import org.pgcodekeeper.core.TestUtils;
 import org.pgcodekeeper.core.api.PgCodeKeeperApi;
-import org.pgcodekeeper.core.database.api.IDatabaseProvider;
 import org.pgcodekeeper.core.database.api.jdbc.IJdbcConnector;
 import org.pgcodekeeper.core.database.base.jdbc.JdbcRunner;
 import org.pgcodekeeper.core.database.base.loader.AbstractDumpLoader;
 import org.pgcodekeeper.core.database.base.parser.ScriptParser;
 import org.pgcodekeeper.core.database.pg.PgDatabaseProvider;
 import org.pgcodekeeper.core.database.pg.jdbc.PgJdbcConnector;
-import org.pgcodekeeper.core.database.pg.jdbc.PgSupportedVersion;
 import org.pgcodekeeper.core.database.pg.loader.PgDumpLoader;
 import org.pgcodekeeper.core.it.jdbc.base.JdbcLoaderTest;
 import org.pgcodekeeper.core.monitor.NullMonitor;
@@ -55,6 +53,7 @@ class PgGpJdbcLoaderTest extends JdbcLoaderTest {
             "operator, PG_16",
             "statistics, PG_16",
             "view, PG_16",
+            "not_null, PG_18",
             "dump_test, GP_6",
             "operator, GP_6",
             "view, GP_6",
@@ -63,17 +62,31 @@ class PgGpJdbcLoaderTest extends JdbcLoaderTest {
             "statistics, GP_7",
             "view, GP_7",
     })
-    void pgGpJdbcLoaderTest(String fileName, String contTypeName) throws Exception {
-        var contType = TestContainerType.valueOf(contTypeName);
-        var lowerCaseTypeName = contTypeName.toLowerCase(Locale.ROOT);
-        var url = contType.getUrl();
-        jdbcLoaderTest(lowerCaseTypeName + "_" + fileName + FILES_POSTFIX.SQL,
-                lowerCaseTypeName + ".pgcodekeeperignore", url, new CoreSettings());
+    void jdbcLoaderTest(String fileName, String contTypeName) throws Exception {
+        var settings = new CoreSettings();
+        settings.setEnableFunctionBodiesDependencies(true);
+        jdbcLoaderTest(false, fileName, contTypeName, settings);
     }
 
-    protected void jdbcLoaderTest(String dumpFileName, String ignoreListName, String url, CoreSettings settings) throws Exception {
-        settings.setEnableFunctionBodiesDependencies(true);
+    @ParameterizedTest
+    @CsvSource({
+            "view, PG_16",
+            "not_null, PG_18"
+    })
+    void jdbcLoaderSpecialTest(String fileName, String contTypeName) throws Exception {
+        var settings = new CoreSettings();
+        settings.setSimplifyNotNull(true);
+        settings.setSimplifyView(true);
+        jdbcLoaderTest(true, fileName, contTypeName, settings);
+    }
+
+    protected void jdbcLoaderTest(boolean hasDiff, String fileName, String contTypeName, ISettings settings)
+            throws Exception {
+        var url = TestContainerType.valueOf(contTypeName).getUrl();
+        var lowerCaseTypeName = contTypeName.toLowerCase(Locale.ROOT);
+        var ignoreListName = lowerCaseTypeName + ".pgcodekeeperignore";
         var diffSettings = new DiffSettings(settings);
+        var dumpFileName = lowerCaseTypeName + "_" + fileName + FILES_POSTFIX.SQL;
         var path = TestUtils.getFilePath(dumpFileName, getClass());
         var dumpDb = databaseProvider.getDumpLoader(path, diffSettings).loadAndAnalyze();
         var script = Files.readString(TestUtils.getFilePath(dumpFileName, getClass()));
@@ -93,15 +106,24 @@ protected void jdbcLoaderTest(String dumpFileName, String ignoreListName, String
                 diffSettings.addIgnoreList(ignoreList);
             }
             var actual = PgCodeKeeperApi.diff(databaseProvider, dumpDb, remoteDb, diffSettings);
-            Assertions.assertEquals("", actual, "Incorrect run dump %s on Database".formatted(dumpFileName));
+
+            String expected;
+            if (hasDiff) {
+                expected = Files.readString(TestUtils.getFilePath(
+                        lowerCaseTypeName + "_" + fileName + FILES_POSTFIX.DIFF_SQL, getClass()));
+            } else {
+                expected = "";
+            }
+
+            Assertions.assertEquals(expected, actual, "Incorrect run dump %s on Database".formatted(dumpFileName));
         } finally {
-            clearDb(settings, startConfDb, connector, url, databaseProvider, diffSettings);
+            clearDb(startConfDb, connector, url, databaseProvider, diffSettings);
         }
     }
 
     @Override
     protected AbstractDumpLoader<?> createDumpLoader(InputStreamProvider input, String inputObjectName,
-                                                     DiffSettings diffSettings) {
+            DiffSettings diffSettings) {
         return new PgDumpLoader(input, inputObjectName, diffSettings);
     }
 }
diff --git a/src/test/java/org/pgcodekeeper/core/utils/testcontainer/Pg16TestContainer.java b/src/test/java/org/pgcodekeeper/core/utils/testcontainer/Pg16TestContainer.java
@@ -19,21 +19,13 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.postgresql.PostgreSQLContainer;
 
-final class Pg16TestContainer implements ITestContainer {
-
-    private static final String TEST_USER = "test";
-    private static final String TEST_PASSWORD = "1245789630";
+final class Pg16TestContainer extends PgAbstractTestContainer {
 
     @Override
     public PgSupportedVersion getVersion() {
         return PgSupportedVersion.VERSION_16;
     }
 
-    @Override
-    public String getDraftUrl() {
-        return "jdbc:postgresql://localhost:%s/test" + "?user=%s&password=%s".formatted(TEST_USER, TEST_PASSWORD);
-    }
-
     @Override
     public GenericContainer<?> getTestContainer() {
         return new PostgreSQLContainer("postgres:16.4-alpine3.20")
diff --git a/src/test/java/org/pgcodekeeper/core/utils/testcontainer/Pg18TestContainer.java b/src/test/java/org/pgcodekeeper/core/utils/testcontainer/Pg18TestContainer.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * 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.utils.testcontainer;
+
+import org.pgcodekeeper.core.database.api.jdbc.ISupportedVersion;
+import org.pgcodekeeper.core.database.pg.jdbc.PgSupportedVersion;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.postgresql.PostgreSQLContainer;
+
+public class Pg18TestContainer extends PgAbstractTestContainer {
+    @Override
+    public ISupportedVersion getVersion() {
+        return PgSupportedVersion.VERSION_18;
+    }
+
+    @Override
+    public GenericContainer<?> getTestContainer() {
+        return new PostgreSQLContainer("postgres:18-alpine")
+                .withUsername(TEST_USER)
+                .withPassword(TEST_PASSWORD);
+    }
+}
diff --git a/src/test/java/org/pgcodekeeper/core/utils/testcontainer/PgAbstractTestContainer.java b/src/test/java/org/pgcodekeeper/core/utils/testcontainer/PgAbstractTestContainer.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.utils.testcontainer;
+
+public abstract class PgAbstractTestContainer implements ITestContainer{
+
+    protected static final String TEST_USER = "test";
+    protected static final String TEST_PASSWORD = "1245789630";
+
+    @Override
+    public String getDraftUrl() {
+        return "jdbc:postgresql://localhost:%s/test" + "?user=%s&password=%s".formatted(TEST_USER, TEST_PASSWORD);
+    }
+}
diff --git a/src/test/java/org/pgcodekeeper/core/utils/testcontainer/TestContainerType.java b/src/test/java/org/pgcodekeeper/core/utils/testcontainer/TestContainerType.java
@@ -21,6 +21,7 @@
 public enum TestContainerType {
 
     PG_16(new Pg16TestContainer()),
+    PG_18(new Pg18TestContainer()),
     MS_16(new Ms16TestContainer()),
     CH_24(new Ch24TestContainer()),
     GP_6(new Gp6TestContainer()),
diff --git a/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_16_view_diff.sql b/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_16_view_diff.sql
@@ -0,0 +1,38 @@
+SET search_path = pg_catalog;
+
+DROP VIEW public.test;
+
+CREATE VIEW public.test AS
+	SELECT t.base_id,
+    t.c2,
+    t.c3,
+    t.c4,
+    tx.id,
+    tx.val
+   FROM ( SELECT v.id AS base_id,
+            ( SELECT ct.c1
+                   FROM public.v1 wa
+                     LEFT JOIN public.v2 ct ON wa.c1 = ct.c2
+                  WHERE ct.c1 <> 4 AND wa.c2 = v.id
+                  ORDER BY wa.c1
+                 LIMIT 1) AS c2,
+            ''::text || sum(
+                CASE
+                    WHEN v.c3 = 1 THEN 1
+                    ELSE 0
+                END)::text AS c3,
+            sum(COALESCE(v.c4, 0)) AS c4
+           FROM ( SELECT st.c1 AS id,
+                        CASE
+                            WHEN public.f1('second'::text, st.c2) > 0 THEN 1
+                            ELSE 0
+                        END AS c2,
+                    st.c3,
+                    st.c4,
+                    st.c5
+                   FROM public.t2 st) v
+          WHERE v.id = public.f2()
+          GROUP BY v.id, v.c2, v.c3, v.c4, v.c5) t
+     LEFT JOIN public.t1 tx ON t.base_id = tx.id;
+
+ALTER VIEW public.test OWNER TO test;
diff --git a/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18.pgcodekeeperignore b/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18.pgcodekeeperignore
@@ -0,0 +1,2 @@
+SHOW ALL
+HIDE NONE plpgsql type=EXTENSION
diff --git a/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18_not_null.sql b/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18_not_null.sql
diff --git a/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18_not_null_diff.sql b/src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_18_not_null_diff.sql

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private void jdbcLoaderTest(String dumpFileName, String url, CoreSettings settin`
`107`	`107`	`var actual = PgCodeKeeperApi.diff(databaseProvider, dumpDb, remoteDb, diffSettings);`
`108`	`108`	`Assertions.assertEquals("", actual, "Incorrect run dump %s on Database".formatted(dumpFileName));`
`109`	`109`	`} finally {`
`110`		`- clearDb(settings, startConfDb, connector, url, databaseProvider, diffSettings);`
	`110`	`+ clearDb(startConfDb, connector, url, databaseProvider, diffSettings);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`