diff --git a/docs/en_US/release_notes_6_1.rst b/docs/en_US/release_notes_6_1.rst index 4ab3e99f2..5ccc45e56 100644 --- a/docs/en_US/release_notes_6_1.rst +++ b/docs/en_US/release_notes_6_1.rst @@ -43,3 +43,4 @@ Bug fixes | `Issue #6928 `_ - Ensure that the master password should be prompt when MASTER_PASSWORD_REQUIRED is set to True and AUTHENTICATION_SOURCES is webserver. | `Issue #6929 `_ - Ensure that only the table node should be allowed to drop on the ERD tool. | `Issue #6930 `_ - Fixed an issue where the existing server group is disappeared on rename it. +| `Issue #6935 `_ - Fixed an issue where the wrong SQL is generated when deleting and renaming table columns together. diff --git a/web/pgadmin/static/js/SchemaView/index.jsx b/web/pgadmin/static/js/SchemaView/index.jsx index 1f326f0da..5f3833d54 100644 --- a/web/pgadmin/static/js/SchemaView/index.jsx +++ b/web/pgadmin/static/js/SchemaView/index.jsx @@ -176,7 +176,7 @@ function getChangedData(topSchema, viewHelperProps, sessData, stringify=false, i /* If the id attr value is present, then only changed keys can be passed. Otherwise, passing all the keys is useful */ - let idAttrValue = _.get(origVal, [field.id, rowIndx, field.schema.idAttribute]); + let idAttrValue = _.get(sessVal, [field.id, rowIndx, field.schema.idAttribute]); if(_.isUndefined(idAttrValue)) { change['changed'].push({ ...changedRow,