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

Fix an issue where sequence owner is remove on sequence edit. #5810

Browse Source
This commit is contained in:
Aditya Toshniwal 2023-02-22 14:06:44 +05:30 committed by GitHub
parent cf28d7df32
commit 9abbd30790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js
View File

@ -51,6 +51,13 @@ export class OwnedBySchema extends BaseUISchema {
optionsReloadBasis: state.owned_table, optionsReloadBasis: state.owned_table,
}; };
}, },
depChange: (state)=>{
if(!state.owned_table) {
return {
owned_column: null,
};
}
}
} }
]; ];
} }

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql
View File

@ -11,7 +11,7 @@ ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }}
OWNER TO {{ conn|qtIdent(data.seqowner) }}; OWNER TO {{ conn|qtIdent(data.seqowner) }};
{% endif %} {% endif %}
{% if (data.owned_table == None or data.owned_table is not defined) and (o_data.owned_table is defined and o_data.owned_table != None) and (data.owned_column == None or data.owned_column is not defined) %} {% if (data.owned_table == None) and (data.owned_column == None) %}
ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }} ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }}
OWNED BY NONE; OWNED BY NONE;
{% elif (data.owned_table is defined or data.owned_column is defined) and (data.owned_table != o_data.owned_table or data.owned_column != o_data.owned_column) %} {% elif (data.owned_table is defined or data.owned_column is defined) and (data.owned_table != o_data.owned_table or data.owned_column != o_data.owned_column) %}

8
web/pgadmin/browser/static/js/node.js
View File

@ -711,12 +711,12 @@ define('pgadmin.browser.node', [
pgBrowser.removeTreeNode(i, selectNextNode); pgBrowser.removeTreeNode(i, selectNextNode);
} }
return true; return true;
}).catch(function(xhr) { }).catch(function(error) {
let errmsg = xhr.responseText; let errmsg = error.request?.responseText;
/* Error from the server */ /* Error from the server */
if (xhr.status == 417 || xhr.status == 410 || xhr.status == 500) { if (error.request?.status == 417 || error.request?.status == 410 || error.request?.status == 500) {
try { try {
let data = JSON.parse(xhr.responseText); let data = error.response.data;
errmsg = data.info || data.errormsg; errmsg = data.info || data.errormsg;
} catch (e) { } catch (e) {
console.warn(e.stack || e); console.warn(e.stack || e);

2
web/pgadmin/static/js/SchemaView/index.jsx
View File

@ -77,7 +77,7 @@ function getForQueryParams(data) {
let retData = {...data}; let retData = {...data};
Object.keys(retData).forEach((key)=>{ Object.keys(retData).forEach((key)=>{
let value = retData[key]; let value = retData[key];
if(_.isObject(value)) { if(_.isObject(value) || _.isNull(value)) {
retData[key] = JSON.stringify(value); retData[key] = JSON.stringify(value);
} }
}); });