fixes #6204 without isOtherRealmScript function

This commit is contained in:
Javi Gallego 2023-09-28 10:05:05 +02:00
parent 5ccb3de3cb
commit b95b593292
1 changed files with 5 additions and 21 deletions

View File

@ -151,22 +151,7 @@ class Push extends Command {
function isUndoScript(script) { function isUndoScript(script) {
return /\.undo\.sql$/.test(script); return /\.undo\.sql$/.test(script);
} }
function isOtherRealmScript(script, realm) {
const splitScript = script.split('.');
const realmPart = splitScript[splitScript.length - 2];
if (splitScript.length <= 2) {
return false;
}
if (!realm) {
return !!realmPart;
}
return realmPart && realmPart !== realm;
}
const skipFiles = new Set([ const skipFiles = new Set([
'README.md', 'README.md',
'.archive' '.archive'
@ -235,13 +220,12 @@ class Push extends Command {
continue; continue;
if (match[1]) { if (match[1]) {
if (skipRealm) { if (skipRealm)
continue; continue;
}
if (!realm)
if (!realm) {
continue; continue;
}
} }
const [[row]] = await conn.query( const [[row]] = await conn.query(
`SELECT errorNumber FROM versionLog `SELECT errorNumber FROM versionLog