Merge branch 'DBTOOLS-2020_fix_auto_formatting' into 'master'

DBTOOLS-2020 fixed auto formatting

See merge request codekeeper/pgcodekeeper-core!240

Author: rYamal4

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed monitor progress tracking.
 - Fixed a bug in the generation of the migration script when data migration when recreating tables with serial-type fields for PostgreSQL.
 - Fixed a bug with searching for dependencies for the LATERAL function in PostgreSQL.
+- Fixed a bug with automatic object code formatting.
 
 ## [14.0.0] - 2026-02-25
 

CHANGELOG.ru.md

@@ -24,6 +24,7 @@
 - Исправлено отслеживание прогресса в мониторах.
 - Исправлена ошибка в генерации скрипта миграции при переливке данных при пересоздании таблиц с полями типа serial в PostgreSQL.
 - Исправлена ошибка с поиском зависимостей для LATERAL функции в PostgreSQL.
+- Исправлена ошибка автоматического форматирования кода объектов.
 
 ## [14.0.0] - 2026-02-25
 

src/main/java/org/pgcodekeeper/core/database/base/project/AbstractModelExporter.java

@@ -107,14 +107,17 @@ protected AbstractModelExporter(Path outDir, IDatabase db, String sqlEncoding, I
     protected AbstractModelExporter(Path outDir, IDatabase newDb, IDatabase oldDb,
                                     Collection<TreeElement> changedObjects,
                                     String sqlEncoding, ISettings settings) {
+        // we should create new settings to get correct script in project files
+        var set = new CoreSettings();
+        set.setFormatConfiguration(settings.getFormatConfiguration());
+        set.setAutoFormatObjectCode(settings.isAutoFormatObjectCode());
+
         this.outDir = outDir;
         this.newDb = newDb;
         this.oldDb = oldDb;
         this.sqlEncoding = sqlEncoding;
         this.changeList = changedObjects;
-
-        // we should create new settings to get correct script in project files
-        this.settings = new CoreSettings();
+        this.settings = set;
     }
 
     /**

src/main/java/org/pgcodekeeper/core/settings/CoreSettings.java

@@ -16,7 +16,7 @@
 package org.pgcodekeeper.core.settings;
 
 import org.pgcodekeeper.core.Consts;
-import org.pgcodekeeper.core.database.base.formatter.FormatConfiguration;
+import org.pgcodekeeper.core.database.api.formatter.IFormatConfiguration;
 import org.pgcodekeeper.core.database.api.schema.DbObjType;
 
 import java.util.ArrayList;
@@ -51,6 +51,8 @@ public class CoreSettings implements ISettings {
     private boolean ignoreConcurrentModification;
     private boolean parallelLoad;
     private boolean disableAutoLoad;
+    private IFormatConfiguration formatConfiguration;
+    private boolean isAutoFormatObjectCode;
 
     private String timeZone;
     private String clusterName;
@@ -134,7 +136,11 @@ public void setCommentsToEnd(boolean commentsToEnd) {
 
     @Override
     public boolean isAutoFormatObjectCode() {
-        return false;
+        return isAutoFormatObjectCode;
+    }
+
+    public void setAutoFormatObjectCode(boolean isAutoFormatObjectCode) {
+        this.isAutoFormatObjectCode = isAutoFormatObjectCode;
     }
 
     @Override
@@ -247,8 +253,12 @@ public void setTimeZone(String timeZone) {
     }
 
     @Override
-    public FormatConfiguration getFormatConfiguration() {
-        return null;
+    public IFormatConfiguration getFormatConfiguration() {
+        return formatConfiguration;
+    }
+
+    public void setFormatConfiguration(IFormatConfiguration formatConfiguration) {
+        this.formatConfiguration = formatConfiguration;
     }
 
     @Override
@@ -334,6 +344,8 @@ public CoreSettings copy() {
         settings.clusterName = clusterName;
         settings.parallelLoad = parallelLoad;
         settings.disableAutoLoad = disableAutoLoad;
+        settings.formatConfiguration = formatConfiguration;
+        settings.isAutoFormatObjectCode = isAutoFormatObjectCode;
         return settings;
     }
 }