Skip to content

copy and freeze in development pass through in production #2

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

Draft
Eliel Amora (AuditBoard) (eamora-ab) wants to merge 3 commits into
base: release/v4.44.5
Choose a base branch
from
Draft

copy and freeze in development pass through in production #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fe54bf
copy and freeze in development pass through in production
eamora-ab Jul 24, 2023
94d3660
remove constructor from a different version
eamora-ab Jul 25, 2023
ab796f2
fix undefined node env
eamora-ab Jul 25, 2023
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
36 changes: 21 additions & 15 deletions lib/dialects/abstract/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,22 @@ const SqlString = require('../../sql-string');
const Dot = require('dottie');
const QueryTypes = require('../../query-types');

const NODE_ENV = process.env.NODE_ENV?.toLowerCase() ?? '';
const IN_DEVELOPMENT = NODE_ENV === 'development';

function identity(result) {
return result;
}
const processRawRequeryResult = IN_DEVELOPMENT ? processRawRequeryResultInDevelopment : identity;

function processRawRequeryResultInDevelopment(result) {
return Object.freeze(Object.assign({}, result));
}

function processRawRequeryResultWithTransforms(result) {
return Dot.transform(processRawRequeryResult(result));
}

class AbstractQuery {

/**
Expand Down Expand Up @@ -264,21 +280,11 @@ class AbstractQuery {
}
// Raw queries
if (this.options.raw) {
result = results.map(result => {
let o = {};

for (const key in result) {
if (result.hasOwnProperty(key)) {
o[key] = result[key];
}
}

if (this.options.nest) {
o = Dot.transform(o);
}

return o;
});
const cb = this.options.nest ? processRawRequeryResultWithTransforms : processRawRequeryResult;
result = [];
for (let i = 0; i < results.length; i++) {
result.push(cb(results[i]));
}
// Queries with include
} else if (this.options.hasJoin === true) {
results = AbstractQuery._groupJoinData(results, {
Expand Down