Merge branch 'DBTOOLS-1791_fix_pg_statistics' into 'master'

DBTOOLS-1791 fixed pg statistics

See merge request codekeeper/pgcodekeeper-core!108

Author: AxelCat

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed an error when reading functions from the ClickHouse database.
+- Fixed a false difference between STATISTICS in PostgreSQL.
 
 ## [13.0.0] - 2025-11-12
 

CHANGELOG.ru.md

@@ -16,6 +16,7 @@
 ### Исправлено
 
 - Исправлена ошибка при чтении функций из базы данных ClickHouse.
+- Исправлено ложное различие для объекта STATISTICS в PostgreSQL.
 
 ## [13.0.0] - 2025-11-12
 

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

@@ -64,7 +64,10 @@ protected void processResult(ResultSet res, AbstractSchema schema) throws SQLExc
                         .parseStatistics(stat));
 
         if (SupportedPgVersion.VERSION_14.isLE(loader.getVersion())) {
-            stat.setStatistics(res.getInt("stxstattarget"));
+            var statVal = res.getString("stxstattarget");
+            if (null != statVal) {
+                stat.setStatistics(Integer.parseInt(statVal));
+            }
         }
 
         loader.setOwner(stat, res.getLong("stxowner"));

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

@@ -20,6 +20,7 @@
 package org.pgcodekeeper.core.schema.pg;
 
 import org.pgcodekeeper.core.PgDiffUtils;
+import org.pgcodekeeper.core.Utils;
 import org.pgcodekeeper.core.hasher.Hasher;
 import org.pgcodekeeper.core.schema.AbstractStatistics;
 import org.pgcodekeeper.core.schema.ObjectState;
@@ -69,7 +70,7 @@ public void getCreationSQL(SQLScript script) {
         sb.append(PgDiffUtils.getQuotedName(foreignTable));
         script.addStatement(sb);
 
-        if (statistics > 0) {
+        if (statistics >= 0) {
             script.addStatement(appendStatistics(this));
         }
 
@@ -158,7 +159,7 @@ public boolean compare(PgStatement obj) {
 
     private boolean compareUnalterable(PgStatistics stat) {
         return Objects.equals(kinds, stat.kinds)
-                && Objects.equals(expressions, stat.expressions)
+                && Utils.setLikeEquals(expressions, stat.expressions)
                 && Objects.equals(stat.foreignSchema, foreignSchema)
                 && Objects.equals(stat.foreignTable, foreignTable);
     }

src/test/resources/org/pgcodekeeper/core/it/jdbc/pg/pg_statistics.sql

@@ -14,13 +14,7 @@ BEGIN
 END;
 $$;
 
---ORIGIN:
---
---CREATE STATISTICS second.s1 ON first.f1(b), a FROM first.t1;
---
---DIFF:
-
---CREATE STATISTICS second.s1 ON a, first.f1(b) FROM first.t1;
+CREATE STATISTICS second.s1 ON first.f1(b), a FROM first.t1;
 
 CREATE STATISTICS second.s2 ON b, first.f1(a) FROM first.v1;
 
@@ -40,4 +34,4 @@ ALTER MATERIALIZED VIEW first.v1 OWNER TO test;
 
 ALTER STATISTICS second.s2 OWNER TO test;
 
---ALTER STATISTICS second.s1 OWNER TO test;
+ALTER STATISTICS second.s1 OWNER TO test;