IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that columns should be merged if the newly added column is present in the parent table. Fixes #6780

Browse Source
This commit is contained in:
Pradip Parkale
2021-10-21 10:59:52 +05:30
committed by Akshay Joshi
parent d2a7f7fffe
commit c7cd57db91
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
View File

@@ -537,7 +537,24 @@ export default class TableSchema extends BaseUISchema {
tabColsResponse.then((res)=>{
resolve((state)=>{
let finalCols = res.map((col)=>obj.columnsSchema.getNewData(col));
finalCols = [...state.columns, ...finalCols];
let currentSelectedCols = [];
if (!_.isEmpty(state.columns)){
currentSelectedCols = state.columns;
}
let colNameList = [];
state.columns.forEach((col=>{
colNameList.push(col.name);
}));
for (let col of Object.values(finalCols)) {
if(!colNameList.includes(col.name)){
currentSelectedCols.push(col);
}
}
if (!_.isEmpty(currentSelectedCols)){
finalCols = currentSelectedCols;
}
obj.changeColumnOptions(finalCols);
return {
adding_inherit_cols: false,