不要怂,就是干,撸起袖子干!

Commit 17b19d9c by Maks Nemisj Committed by Sushant

fix(abstract-query): properly hash primaryKey for buffers (#8174)

1 parent 06779e55
......@@ -479,6 +479,7 @@ class AbstractQuery {
return uniqueKeyAttributes;
};
const stringify = obj => obj instanceof Buffer ? obj.toString('hex') : obj;
let primaryKeyAttributes;
let uniqueKeyAttributes;
let prefix;
......@@ -499,11 +500,11 @@ class AbstractQuery {
$length = includeOptions.model.primaryKeyAttributes.length;
topHash = '';
if ($length === 1) {
topHash = row[includeOptions.model.primaryKeyAttributes[0]];
topHash = stringify(row[includeOptions.model.primaryKeyAttributes[0]]);
}
else if ($length > 1) {
for ($i = 0; $i < $length; $i++) {
topHash += row[includeOptions.model.primaryKeyAttributes[$i]];
topHash += stringify(row[includeOptions.model.primaryKeyAttributes[$i]]);
}
}
else if (!_.isEmpty(includeOptions.model.uniqueKeys)) {
......@@ -551,11 +552,11 @@ class AbstractQuery {
$length = primaryKeyAttributes.length;
itemHash = prefix;
if ($length === 1) {
itemHash += row[prefix+'.'+primaryKeyAttributes[0]];
itemHash += stringify(row[prefix+'.'+primaryKeyAttributes[0]]);
}
else if ($length > 1) {
for ($i = 0; $i < $length; $i++) {
itemHash += row[prefix+'.'+primaryKeyAttributes[$i]];
itemHash += stringify(row[prefix+'.'+primaryKeyAttributes[$i]]);
}
}
else if (!_.isEmpty(includeMap[prefix].model.uniqueKeys)) {
......@@ -640,11 +641,11 @@ class AbstractQuery {
$length = primaryKeyAttributes.length;
itemHash = prefix;
if ($length === 1) {
itemHash += row[prefix+'.'+primaryKeyAttributes[0]];
itemHash += stringify(row[prefix+'.'+primaryKeyAttributes[0]]);
}
else if ($length > 0) {
for ($i = 0; $i < $length; $i++) {
itemHash += row[prefix+'.'+primaryKeyAttributes[$i]];
itemHash += stringify(row[prefix+'.'+primaryKeyAttributes[$i]]);
}
}
else if (!_.isEmpty(includeMap[prefix].model.uniqueKeys)) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!