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 oid column should not be pasted when copy/paste row is used on query output containing the oid column. Fixes #4381

Browse Source
This commit is contained in:
Aditya Toshniwal
2019-08-28 13:35:40 +05:30
committed by Akshay Joshi
parent ac298b03c0
commit 028473eb83
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@@ -3712,6 +3712,10 @@ define('tools.querytool', [
new_row.is_row_copied = true;
self.temp_new_rows.push(count);
new_row[self.client_primary_key] = _key;
if(self.has_oids && new_row.oid) {
new_row.oid = null;
}
dataView.addItem(new_row);
self.data_store.added[_key] = {
'err': false,

9
web/pgadmin/tools/sqleditor/utils/save_changed_data.py
View File

@@ -98,7 +98,6 @@ def save_changed_data(changed_data, columns_info, conn, command_obj,
# of not null which is set by default.
column_data = {}
pk_names, primary_keys = command_obj.get_primary_keys()
has_oids = 'oid' in column_type
for each_row in added_index:
# Get the row index to match with the added rows
@@ -109,6 +108,10 @@ def save_changed_data(changed_data, columns_info, conn, command_obj,
data.pop(client_primary_key, None)
data.pop('is_row_copied', None)
# Remove oid col
if command_obj.has_oids():
data.pop('oid', None)
# Update columns value with columns having
# not_null=False and has no default value
column_data.update(data)
@@ -122,7 +125,7 @@ def save_changed_data(changed_data, columns_info, conn, command_obj,
nsp_name=command_obj.nsp_name,
data_type=column_type,
pk_names=pk_names,
has_oids=has_oids
has_oids=command_obj.has_oids()
)
select_sql = render_template(
@@ -130,7 +133,7 @@ def save_changed_data(changed_data, columns_info, conn, command_obj,
object_name=command_obj.object_name,
nsp_name=command_obj.nsp_name,
primary_keys=primary_keys,
has_oids=has_oids
has_oids=command_obj.has_oids()
)
list_of_sql[of_type].append({