From b55dbe50a7640d3461502115c4f6f192807a9ade Mon Sep 17 00:00:00 2001
From: Konstantin Krivopustov <krivopustov@haulmont.com>
Date: Fri, 22 May 2026 14:41:55 +0400
Subject: [PATCH 1/2] Rename AUDIT_LOGGED_ENTITY.MANUAL to MANUAL_

---
 .../io/jmix/audit/entity/LoggedEntity.java    |  4 +-
 .../io/jmix/audit/liquibase/changelog.xml     |  1 +
 .../audit/liquibase/changelog/004-audit.xml   | 38 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml

diff --git a/jmix-audit/audit/src/main/java/io/jmix/audit/entity/LoggedEntity.java b/jmix-audit/audit/src/main/java/io/jmix/audit/entity/LoggedEntity.java
index 5d3bb91d1f..2040a423c6 100644
--- a/jmix-audit/audit/src/main/java/io/jmix/audit/entity/LoggedEntity.java
+++ b/jmix-audit/audit/src/main/java/io/jmix/audit/entity/LoggedEntity.java
@@ -59,10 +59,10 @@ public class LoggedEntity implements Serializable {
     @Column(name = "NAME", length = 100, unique = true)
     private String name;
 
-    @Column(name = "AUTO")
+    @Column(name = "AUTO_")
     private Boolean auto;
 
-    @Column(name = "MANUAL")
+    @Column(name = "MANUAL_")
     private Boolean manual;
 
     @OneToMany(mappedBy = "entity")
diff --git a/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog.xml b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog.xml
index 52eb3a8a36..0d65cde24e 100644
--- a/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog.xml
+++ b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog.xml
@@ -28,5 +28,6 @@
     <include file="/io/jmix/audit/liquibase/changelog/001-audit.xml"/>
     <include file="/io/jmix/audit/liquibase/changelog/002-audit.xml"/>
     <include file="/io/jmix/audit/liquibase/changelog/003-audit.xml"/>
+    <include file="/io/jmix/audit/liquibase/changelog/004-audit.xml"/>
 
 </databaseChangeLog>
diff --git a/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml
new file mode 100644
index 0000000000..36521519f5
--- /dev/null
+++ b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2026 Haulmont.
+  ~
+  ~ 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.
+  -->
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+    <changeSet author="audit" id="1" context="!cuba">
+        <renameColumn tableName="AUDIT_LOGGED_ENTITY"
+                oldColumnName="MANUAL"
+                newColumnName="MANUAL_"
+                columnDataType="boolean"/>
+    </changeSet>
+
+    <changeSet author="audit" id="2" context="!cuba">
+        <renameColumn tableName="AUDIT_LOGGED_ENTITY"
+                oldColumnName="AUTO"
+                newColumnName="AUTO_"
+                columnDataType="boolean"/>
+    </changeSet>
+
+</databaseChangeLog>

From de2230bae3aeac2f06bbe96126a54dd5ec019799 Mon Sep 17 00:00:00 2001
From: Konstantin Krivopustov <krivopustov@haulmont.com>
Date: Tue, 26 May 2026 12:18:47 +0400
Subject: [PATCH 2/2] Remove unnecessary context

---
 .../resources/io/jmix/audit/liquibase/changelog/004-audit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml
index 36521519f5..8d65d0ecec 100644
--- a/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml
+++ b/jmix-audit/audit/src/main/resources/io/jmix/audit/liquibase/changelog/004-audit.xml
@@ -21,14 +21,14 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
 
-    <changeSet author="audit" id="1" context="!cuba">
+    <changeSet author="audit" id="1">
         <renameColumn tableName="AUDIT_LOGGED_ENTITY"
                 oldColumnName="MANUAL"
                 newColumnName="MANUAL_"
                 columnDataType="boolean"/>
     </changeSet>
 
-    <changeSet author="audit" id="2" context="!cuba">
+    <changeSet author="audit" id="2">
         <renameColumn tableName="AUDIT_LOGGED_ENTITY"
                 oldColumnName="AUTO"
                 newColumnName="AUTO_"