Merge branch 'DBTOOLS-1804-fix-pg-18-constraint-names' into 'master'

DBTOOLS-1804 fixed pg 18 constraint names diff

See merge request codekeeper/pgcodekeeper-core!99

Author: AXEPOH

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed CTE formatting in ClickHouse.
 - Fixed a bug in the behavior of the compiler when the ignore column order setting is enabled.
 - Fixed bug in generating the migration script when adding a column to Log family tables in ClickHouse.
+- Fixed a false difference between NOT NULL constraints with the default name in PostgreSQL.
 
 ## [12.0.0] - 2025-10-14
 

CHANGELOG.ru.md

@@ -21,6 +21,7 @@
 - Исправлено форматирование CTE в ClickHouse.
 - Исправлена ошибка сравнения таблиц при включённой настройке игнорирования порядка столбцов.
 - Исправлена ошибка в генерации скрипта миграции при добавлении колонки в таблицах семейства Log в ClickHouse.
+- Исправлено ложное различие ограничений NOT NULL с именем по умолчанию в PostgreSQL.
 
 ## [12.0.0] - 2025-10-14
 

src/main/java/org/pgcodekeeper/core/loader/jdbc/pg/TablesReader.java

@@ -231,21 +231,21 @@ private void readColumns(ResultSet res, AbstractPgTable t, long ofTypeOid,
             colNotNullNoInherit = getColArray(res, "col_notnull_no_inherit");
         }
 
-        Integer[] colStatictics;
+        Integer[] colStatistics;
         if (SupportedPgVersion.VERSION_16.isLE(loader.getVersion())) {
             // in PG 16 type changed from int4 to int2
-            Short[] tmpStatictics = getColArray(res, "col_statictics");
-            colStatictics = new Integer[tmpStatictics.length];
-            for (int i = 0; i < tmpStatictics.length; i++) {
+            Short[] tmpStatistics = getColArray(res, "col_statistics");
+            colStatistics = new Integer[tmpStatistics.length];
+            for (int i = 0; i < tmpStatistics.length; i++) {
                 //in PG 17 we can have null instead -1
-                if (tmpStatictics[i] == null) {
-                    colStatictics[i] = -1;
+                if (tmpStatistics[i] == null) {
+                    colStatistics[i] = -1;
                 } else {
-                    colStatictics[i] = (int) tmpStatictics[i];
+                    colStatistics[i] = (int) tmpStatistics[i];
                 }
             }
         } else {
-            colStatictics = getColArray(res, "col_statictics");
+            colStatistics = getColArray(res, "col_statistics");
         }
 
         Boolean[] colIsLocal = getColArray(res, "col_local");
@@ -338,11 +338,11 @@ private void readColumns(ResultSet res, AbstractPgTable t, long ofTypeOid,
                 column.setNotNull(true);
                 if (SupportedPgVersion.VERSION_18.isLE(loader.getVersion())) {
                     column.setNotNullNoInherit(colNotNullNoInherit[i]);
-                    column.setNotNullConName(colNotNullConName[i]);
+                    column.setNotNullConName(t.getName(), colNotNullConName[i]);
                 }
             }
 
-            int statistics = colStatictics[i];
+            int statistics = colStatistics[i];
             // if the attstattarget entry for this column is
             // non-negative (i.e. it's not the default value)
             if (statistics > -1) {
@@ -587,7 +587,7 @@ ELSE NOT EXISTS(SELECT 1 FROM inherits inh WHERE inh.inhrelid = a.attrelid AND i
                            END
                           ) ORDER BY a.attnum
                         ) AS col_notnull""")
-                .column("pg_catalog.array_agg(a.attstattarget ORDER BY a.attnum) AS col_statictics")
+                .column("pg_catalog.array_agg(a.attstattarget ORDER BY a.attnum) AS col_statistics")
                 .column("pg_catalog.array_agg(a.attislocal ORDER BY a.attnum) AS col_local")
                 .column("pg_catalog.array_agg(a.attacl::text ORDER BY a.attnum) AS col_acl")
                 .column("pg_catalog.array_agg(a.attcollation::bigint ORDER BY a.attnum) AS col_collation")
@@ -643,7 +643,7 @@ ELSE NOT EXISTS(SELECT 1 FROM inherits inh WHERE inh.inhrelid = a.attrelid AND i
         builder.column("columns.col_type_ids");
         builder.column("columns.col_type_name");
         builder.column("columns.col_notnull");
-        builder.column("columns.col_statictics");
+        builder.column("columns.col_statistics");
         builder.column("columns.col_local");
         builder.column("columns.col_acl");
         builder.column("columns.col_collation");

src/main/java/org/pgcodekeeper/core/parsers/antlr/pg/statement/CreateTable.java

@@ -210,7 +210,7 @@ protected void fillColNotNull(AbstractTable table, Constraint_commonContext tblC
         AntlrTaskManager.submit(antlrTasks, () -> colNameCtx, colCtx -> {
             var col = (PgColumn) getSafe(AbstractTable::getColumn, table, colNameCtx);
             if (col != null) {
-                fillColNotNull(col, tblConstrCtx);
+                fillColNotNull(col, table.getName(), tblConstrCtx);
             }
         });
     }

src/main/java/org/pgcodekeeper/core/parsers/antlr/pg/statement/TableAbstract.java

@@ -95,19 +95,19 @@ protected void fillColNotNull(AbstractTable table, Constraint_commonContext tblC
                                   Schema_qualified_nameContext colNameCtx) {
         var col = (PgColumn) getSafe(AbstractTable::getColumn, table, colNameCtx);
         if (col != null) {
-            fillColNotNull(col, tblConstrCtx);
+            fillColNotNull(col, table.getName(), tblConstrCtx);
         }
     }
 
-    protected static void fillColNotNull(PgColumn col, Constraint_commonContext constraint) {
+    protected static void fillColNotNull(PgColumn col, String tableName, Constraint_commonContext constraint) {
         var body = constraint.constr_body();
-        var constraintName = constraint.identifier();
-
         col.setNotNull(body.NOT() != null);
-        if (constraintName != null) {
-            col.setNotNullConName(constraintName.getText());
-        }
         col.setNotNullNoInherit(body.inherit_option() != null);
+
+        var constraintNameCtx = constraint.identifier();
+        if (constraintNameCtx != null) {
+            col.setNotNullConName(tableName, constraintNameCtx.getText());
+        }
     }
 
     private void addTableConstraint(Constraint_commonContext ctx, PgColumn col,
@@ -121,7 +121,7 @@ private void addTableConstraint(Constraint_commonContext ctx, PgColumn col,
             col.setDefaultValue(getExpressionText(def, stream));
             db.addAnalysisLauncher(new VexAnalysisLauncher(col, def, fileName));
         } else if (body.NULL() != null) {
-            fillColNotNull(col, ctx);
+            fillColNotNull(col, table.getName(), ctx);
         } else if (body.REFERENCES() != null) {
             IdentifierContext id = ctx.identifier();
             String constrName = id == null ? table.getName() + '_' + colName + "_fkey" : id.getText();

src/main/java/org/pgcodekeeper/core/schema/pg/PgColumn.java

@@ -113,7 +113,7 @@ private void definitionDefaultNotNull(StringBuilder sbDefinition) {
 
         if (notNull) {
             if (notNullConName != null) {
-                sbDefinition.append(" CONSTRAINT ").append(getNotNullConName());
+                sbDefinition.append(" CONSTRAINT ").append(notNullConName);
             }
             sbDefinition.append(NOT_NULL);
             if (isNotNullNoInherit) {
@@ -755,6 +755,12 @@ public void setNotNullNoInherit(boolean isNotNullNoInherit) {
         resetHash();
     }
 
+    public void setNotNullConName(String tableName, String conName) {
+        if (!DEFAULT_NOT_NULL_CONSTRAINT_NAME.formatted(tableName, name).equals(conName)) {
+            setNotNullConName(conName);
+        }
+    }
+
     public void setNotNullConName(String notNullConName) {
         this.notNullConName = notNullConName;
         resetHash();

src/test/resources/org/pgcodekeeper/core/it/diff/pg/modify_not_null_new.sql

@@ -8,6 +8,7 @@ CREATE TABLE public.testtable (
     field7 integer,
     field8 integer,
     field9 integer NOT NULL,
+    field10 integer constraint testtable_field10_not_null NOT NULL,
     CONSTRAINT field7_not_null_test NOT NULL field7 NO INHERIT,
     CONSTRAINT testtable_field8_not_null NOT NULL field8
 );

src/test/resources/org/pgcodekeeper/core/it/diff/pg/modify_not_null_original.sql

@@ -7,5 +7,6 @@ CREATE TABLE public.testtable (
     field6 integer NOT NULL,
     field7 integer NOT NULL,
     field8 integer NOT NULL,
-    field9 integer NOT NULL
+    field9 integer NOT NULL,
+    field10 integer NOT NULL
 );