From 5ccb3de3cbc4ce816f134a9de6a144946da9a8dd Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 28 Sep 2023 10:02:40 +0200
Subject: [PATCH] fixes #6204 regexp makes match

---
 myt-push.js | 23 ++++++++++++++++++-----
 myt.js      |  8 --------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/myt-push.js b/myt-push.js
index 380ad1c..8d3b6c2 100644
--- a/myt-push.js
+++ b/myt-push.js
@@ -174,6 +174,10 @@ class Push extends Command {
 
         if (await fs.pathExists(versionsDir)) {
             const versionDirs = await fs.readdir(versionsDir);
+            const [[realm]] = await this.conn.query(
+                `SELECT realm
+                    FROM versionConfig`
+            );
 
             for (const versionDir of versionDirs) {
                 if (skipFiles.has(versionDir)) continue;
@@ -207,8 +211,6 @@ class Push extends Command {
                     [opts.code, versionNumber]
                 );
 
-                const realm = await myt.fetchDbRealm();
-
                 for (const script of scripts)
                 if (!isUndoScript(script)
                 && versionLog.findIndex(x => x.file == script) === -1) {
@@ -220,16 +222,27 @@ class Push extends Command {
                 logVersion(`[${versionNumber}]`.cyan, versionName);
 
                 for (const script of scripts) {
-                    if (!/^[0-9]{2}-[a-zA-Z0-9_]+(\..+)?\.sql$/.test(script)) {
+                    const match = script.match(/^[0-9]{2}-[a-zA-Z0-9_]+(?:\.(?!undo)([a-zA-Z0-9_]+))?(?:\.undo)?\.sql$/);
+                    
+                    if (!match) {
                         logScript('[W]'.yellow, script, `Wrong file name.`);
                         continue;
                     }
+
+                    const skipRealm = match & match[1] && match[1] !== realm;
+
                     if (isUndoScript(script))
                         continue;
 
-                    if (isOtherRealmScript(script, realm))
-                        continue;
+                    if (match[1]) {
+                        if (skipRealm) {
+                            continue;
+                        }
 
+                        if (!realm) {
+                            continue;
+                        }
+                    }
                     const [[row]] = await conn.query(
                         `SELECT errorNumber FROM versionLog
                             WHERE code = ?
diff --git a/myt.js b/myt.js
index f034fbc..15b21d7 100755
--- a/myt.js
+++ b/myt.js
@@ -323,14 +323,6 @@ class Myt {
         return version;
     }
 
-
-    async fetchDbRealm() {
-        const [[realm]] = await this.conn.query(
-            `SELECT realm
-                FROM versionConfig`
-        );
-        return realm?.realm;
-    }
     parseVersionDir(versionDir) {
         const match = versionDir.match(/^([0-9]+)-([a-zA-Z0-9]+)?$/);
         if (!match) return null;