Merge branch 'DBTOOLS-1779-remove-only-in-partitioned-tables' into 'master'

DBTOOLS-1779 remove only in partitioned tables

See merge request codekeeper/pgcodekeeper-core!96

Author: AXEPOH

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - 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.
+- Fixed adding ONLY for columns in partitioned tables in PostgreSQL.
 
 ## [12.0.0] - 2025-10-14
 

CHANGELOG.ru.md

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

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

@@ -162,6 +162,11 @@ private void compareTemplates(PartitionGpTable newTable, SQLScript script) {
         });
     }
 
+    @Override
+    public String getPartitionBy() {
+        return normalizedPartitionGpBounds;
+    }
+
     @Override
     protected void compareTableTypes(AbstractPgTable newTable, SQLScript script) {
         // no implements

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

@@ -220,19 +220,8 @@ private String getAlterTableColumn(boolean only, String column, boolean needAlte
     @Override
     public void getDropSQL(SQLScript script, boolean optionExists) {
         if (type != null && getParentCol((AbstractPgTable) parent) == null) {
-            boolean addOnly = true;
-
-            //// Condition for partitioned tables.
-            // If there are sections, then it is impossible to delete a column
-            // only from a partitioned table.
-            // Because of impossible inherit from partitioned tables, this
-            // condition will also be true for cases when a partitioned table
-            // does not have sections.
-            if (parent instanceof AbstractRegularTable regTable) {
-                addOnly = regTable.getPartitionBy() == null;
-            }
             StringBuilder dropSb = new StringBuilder();
-            dropSb.append(getAlterTable(addOnly)).append("\n\tDROP COLUMN ");
+            dropSb.append(getAlterTable(isNeedOnly())).append("\n\tDROP COLUMN ");
             if (optionExists) {
                 dropSb.append(IF_EXISTS);
             }
@@ -255,6 +244,16 @@ public void getDropSQL(SQLScript script, boolean optionExists) {
         appendComments(script);
     }
 
+    /**
+     * @return true if parent table isn't partition table with existing partitions, false otherwise
+     */
+    private boolean isNeedOnly() {
+        if (parent instanceof AbstractRegularTable regTable) {
+            return regTable.getPartitionBy() == null;
+        }
+        return true;
+    }
+
     @Override
     public ObjectState appendAlterSQL(PgStatement newCondition, SQLScript script) {
         int startSize = script.getSize();
@@ -311,7 +310,7 @@ private boolean compareCompressOptions(PgColumn newColumn) {
     private void writeOptions(boolean isCreate, SQLScript script) {
         if (!options.isEmpty()) {
             StringBuilder sb = new StringBuilder();
-            sb.append(getAlterTableColumn(true, name));
+            sb.append(getAlterTableColumn(isNeedOnly(), name));
             sb.append(isCreate ? " SET (" : " RESET (");
             for (Entry<String, String> option : options.entrySet()) {
                 sb.append(option.getKey());
@@ -492,7 +491,7 @@ private void compareNotNull(PgColumn oldColumn, PgColumn newColumn, SQLScript sc
         boolean newNotNull = newColumn != null && newColumn.isNotNull();
 
         if (oldNotNull && !newNotNull) {
-            script.addStatement(getAlterTableColumn(true, name) + " DROP" + NOT_NULL);
+            script.addStatement(getAlterTableColumn(isNeedOnly(), name) + " DROP" + NOT_NULL);
             return;
         }
 

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

@@ -2,6 +2,9 @@ SET search_path = pg_catalog;
 
 DROP TABLE public.cities_mz;
 
+ALTER TABLE public.sales
+	DROP COLUMN amount;
+
 DROP TABLE public.cities_hi;
 
 ALTER TABLE public.cities_cd
@@ -35,6 +38,9 @@ CREATE TABLE public.tab_of_type OF public.comp (
 
 ALTER TABLE public.tab_of_type OWNER TO galiev_mr;
 
+ALTER TABLE public.measurement
+	ALTER COLUMN logdate DROP NOT NULL;
+
 ALTER TABLE public.cities_ab
 	DROP CONSTRAINT constr_check;
 

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

@@ -82,4 +82,41 @@ CREATE TABLE public.tab_of_type OF public.comp (
     CONSTRAINT tab_of_type_f3_check CHECK ((f3 > 1))
 );
 
-ALTER TABLE public.tab_of_type OWNER TO galiev_mr;
+ALTER TABLE public.tab_of_type OWNER TO galiev_mr;
+
+CREATE TABLE public.measurement (
+	id integer DEFAULT nextval('public.measurement_id_seq'::regclass) NOT NULL,
+	logdate date,
+	temperature real
+)
+PARTITION BY RANGE (logdate);
+
+ALTER TABLE public.measurement OWNER TO rashit;
+
+CREATE TABLE public.measurement_2023 PARTITION OF public.measurement
+FOR VALUES FROM ('2023-01-01') TO ('2024-01-01');
+
+ALTER TABLE ONLY public.measurement_2023 ALTER COLUMN id SET DEFAULT nextval('public.measurement_id_seq'::regclass);
+
+ALTER TABLE public.measurement_2023 OWNER TO rashit;
+
+CREATE TABLE public.measurement_2024 PARTITION OF public.measurement
+FOR VALUES FROM ('2024-01-01') TO ('2025-01-01');
+
+ALTER TABLE ONLY public.measurement_2024 ALTER COLUMN id SET DEFAULT nextval('public.measurement_id_seq'::regclass);
+
+ALTER TABLE public.measurement_2024 OWNER TO rashit;
+
+CREATE TABLE public.sales (
+	id integer,
+	sale_date date,
+	rand integer
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(sale_date)
+          (
+          START ('2024-01-01'::date) END ('2024-04-01'::date) EVERY ('1 mon'::interval),
+          DEFAULT PARTITION extra
+          );
+
+ALTER TABLE public.sales OWNER TO rashit;

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

@@ -94,4 +94,42 @@ CREATE TABLE public.tab_of_type OF public.comp (
 )
 PARTITION BY LIST ("left"(lower(f2), 1));
 
-ALTER TABLE public.tab_of_type OWNER TO galiev_mr;
+ALTER TABLE public.tab_of_type OWNER TO galiev_mr;
+
+CREATE TABLE public.measurement (
+	id integer DEFAULT nextval('public.measurement_id_seq'::regclass) NOT NULL,
+	logdate date NOT NULL,
+	temperature real
+)
+PARTITION BY RANGE (logdate);
+
+ALTER TABLE public.measurement OWNER TO rashit;
+
+CREATE TABLE public.measurement_2023 PARTITION OF public.measurement
+FOR VALUES FROM ('2023-01-01') TO ('2024-01-01');
+
+ALTER TABLE ONLY public.measurement_2023 ALTER COLUMN id SET DEFAULT nextval('public.measurement_id_seq'::regclass);
+
+ALTER TABLE public.measurement_2023 OWNER TO rashit;
+
+CREATE TABLE public.measurement_2024 PARTITION OF public.measurement
+FOR VALUES FROM ('2024-01-01') TO ('2025-01-01');
+
+ALTER TABLE ONLY public.measurement_2024 ALTER COLUMN id SET DEFAULT nextval('public.measurement_id_seq'::regclass);
+
+ALTER TABLE public.measurement_2024 OWNER TO rashit;
+
+CREATE TABLE public.sales (
+	id integer,
+	sale_date date,
+	amount numeric(10,2),
+	rand integer
+)
+DISTRIBUTED BY (id)
+PARTITION BY RANGE(sale_date)
+          (
+          START ('2024-01-01'::date) END ('2024-04-01'::date) EVERY ('1 mon'::interval),
+          DEFAULT PARTITION extra
+          );
+
+ALTER TABLE public.sales OWNER TO rashit;