pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't cast data when saving in the edit grid, so errors are seen and data doesn't get silently modified. Fixes #1994

pull/3/head
Akshay Joshi 2016-12-09 12:05:46 +00:00 committed by Dave Page
parent 81841cdb3c
commit b8d03d5dc2
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -1980,8 +1980,6 @@ define(
')'; ')';
} }
column_label = c.display_name + '<br>' + col_type;
// Identify cell type of column. // Identify cell type of column.
switch(type) { switch(type) {
case "json": case "json":
@ -2002,10 +2000,22 @@ define(
case "boolean": case "boolean":
col_cell = 'boolean'; col_cell = 'boolean';
break; break;
case "character":
case "character[]":
case "character varying":
case "character varying[]":
if (c.internal_size && c.internal_size != 65535) {
// Update column type to display length on column header
col_type += ' (' + c.internal_size + ')';
}
col_cell = 'string';
break;
default: default:
col_cell = 'string'; col_cell = 'string';
} }
column_label = c.display_name + '<br>' + col_type;
var col = { var col = {
'name': c.name, 'name': c.name,
'label': column_label, 'label': column_label,

2
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.1_plus/insert.sql
View File

@ -12,5 +12,5 @@ INSERT INTO {{ conn|qtIdent(nsp_name, object_name) }} (
{% set col_value = data_to_be_saved[col]|qtLiteral %} {% set col_value = data_to_be_saved[col]|qtLiteral %}
{% endif %} {% endif %}
{########################################################} {########################################################}
{% if not loop.first %}, {% endif %}{{ col_value }}::{{data_type[col]}}{% endfor %} {% if not loop.first %}, {% endif %}{{ col_value }}{% endfor %}
); );

2
web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.1_plus/update.sql
View File

@ -9,7 +9,7 @@ UPDATE {{ conn|qtIdent(nsp_name, object_name) }} SET
{% set col_value = data_to_be_saved[col]|qtLiteral %} {% set col_value = data_to_be_saved[col]|qtLiteral %}
{% endif %} {% endif %}
{########################################################} {########################################################}
{% if not loop.first %}, {% endif %}{{ conn|qtIdent(col) }} = {{ col_value }}::{{data_type[col]}}{% endfor %} {% if not loop.first %}, {% endif %}{{ conn|qtIdent(col) }} = {{ col_value }}{% endfor %}
WHERE WHERE
{% for pk in primary_keys %} {% for pk in primary_keys %}
{% if not loop.first %} AND {% endif %}{{ conn|qtIdent(pk) }} = {{ primary_keys[pk]|qtLiteral }}{% endfor %}; {% if not loop.first %} AND {% endif %}{{ conn|qtIdent(pk) }} = {{ primary_keys[pk]|qtLiteral }}{% endfor %};