From 76a4dee4514c167871ac063891c0260176d44376 Mon Sep 17 00:00:00 2001
From: Yogesh Mahajan <yogesh.mahajan@enterprisedb.com>
Date: Fri, 11 Feb 2022 10:21:43 +0530
Subject: [PATCH] Fixed the schema diff issue where tables have different
 column positions and a column has a default value. Fixes #7124

---
 docs/en_US/release_notes.rst                  |  1 +
 docs/en_US/release_notes_6_6.rst              | 21 +++++++++++++++++++
 .../schemas/tables/schema_diff_utils.py       |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 docs/en_US/release_notes_6_6.rst

diff --git a/docs/en_US/release_notes.rst b/docs/en_US/release_notes.rst
index d9b135d62..8f2babe3d 100644
--- a/docs/en_US/release_notes.rst
+++ b/docs/en_US/release_notes.rst
@@ -11,6 +11,7 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_6_6
    release_notes_6_5
    release_notes_6_4
    release_notes_6_3
diff --git a/docs/en_US/release_notes_6_6.rst b/docs/en_US/release_notes_6_6.rst
new file mode 100644
index 000000000..ab3b340ee
--- /dev/null
+++ b/docs/en_US/release_notes_6_6.rst
@@ -0,0 +1,21 @@
+************
+Version 6.6
+************
+
+Release date: 2021-03-10
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.5.
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+
+Bug fixes
+*********
+
+| `Issue #7124 <https://redmine.postgresql.org/issues/7124>`_ -  Fixed the schema diff issue where tables have different column positions and a column has a default value.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py
index 1d4cdc791..143c1dc34 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py
@@ -24,7 +24,8 @@ class SchemaDiffTableCompare(SchemaDiffObjectCompare):
                             'rows_cnt', 'hastoasttable', 'relhassubclass',
                             'relacl_str', 'setting']
 
-    column_keys_to_ignore = ['atttypid', 'edit_types', 'elemoid', 'seqrelid']
+    column_keys_to_ignore = ['atttypid', 'edit_types', 'elemoid', 'seqrelid',
+                             'indkey']
 
     constraint_keys_to_ignore = ['relname', 'nspname', 'parent_tbl',
                                  'attrelid', 'adrelid', 'fknsp', 'confrelid',
@@ -167,6 +168,7 @@ class SchemaDiffTableCompare(SchemaDiffObjectCompare):
 
             if item['name'] == source['name']:
                 tmp = copy.deepcopy(item)
+                source['attnum'] = tmp['attnum']
 
         if tmp and source != tmp:
             updated.append(source)