Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treat null value of json the same as other types #1002

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Treat null value of json the same as other types #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2780,12 +2780,10 @@

var self = this;

//This check has been added to show "null" in all the rows if the user inputs blank string
//We are opting json out here because we want null in the UI instead of "", so we do not call _getNullValue for json
if (data === undefined || (data === null && this.type.name.indexOf('json') === -1)) {
// this used to treat json differently but we don't want that anymore.
// since we cannot distinguish between json null and database null, we decided to show it as database null anyways.
if (data === undefined || data === null) {
return this._getNullValue(context);
} else if (data === null && this.type.name.indexOf('json') !== 0) {
return data;
}

var display = this.getDisplay(context);
Expand Down Expand Up @@ -2848,7 +2846,13 @@
* If column doesn't has column-display annotation and is not of type markdown
* but the column type is json then append <pre> tag and return the value
*/
if (!display.isHTML && this.type.name.indexOf('json') !== -1) {
if (!display.isHTML && this.type.name.indexOf('json') === 0) {
// jsonb column should be treated similar to other columns, so
// If value is null or empty, return value on based on `show_null` instead of adding the code block.
if (rawValue === null || rawValue === undefined) {
return { isHTML: false, value: this._getNullValue(context), unformatted: this._getNullValue(context) };
}

return { isHTML: true, value: '<pre>' + formattedValue + '</pre>', unformatted: formattedValue};
}

Expand Down
4 changes: 2 additions & 2 deletions test/specs/reference/tests/17.reference_pre_format_values.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ exports.execute = function (options) {

describe("testing tuple values for format", function() {
var testObjects = [{
"expectedValues": ["4000","Hank","http://example.com/google.com","No","10000000000 1024 1024 1.024e+3"," 0.234","<pre>null</pre>", "", ""]
"expectedValues": ["4000","Hank","http://example.com/google.com","No","10000000000 1024 1024 1.024e+3"," 0.234","", "", ""]
},
{
"expectedValues": ["4001","Harold", "","Yes","", "10,000.345", "<pre>My name is Harold Durden. My age is 29 years and I study at USC located in Los Angeles, CA. My GPA is 3.93</pre>", "", ""]
},
{
"expectedValues": ["4002", null, "http://example.com/google.com","","10001100101001 9001 9001 9.001e+3","","<pre>null</pre>", "<p>YES, NOPE, <em>No value</em></p>\n", "<p>2.340, 2.400, <em>No value</em></p>\n"]
"expectedValues": ["4002", null, "http://example.com/google.com","","10001100101001 9001 9001 9.001e+3","","", "<p>YES, NOPE, <em>No value</em></p>\n", "<p>2.340, 2.400, <em>No value</em></p>\n"]
}];

var i = 0;
Expand Down