mysqlsyncr 1.1.10 → 1.2.1

package/src/versions.js

@@ -0,0 +1,112 @@
+import fs from 'fs/promises';
+import path from 'path';
+
+// '8.0.36-log' -> { major: 8, minor: 0 }; also takes '5.7'
+const parseVersion = (version) => {
+    const match = typeof version === 'string' && version.match(/^(\d+)\.(\d+)/);
+    return match ? { major: Number(match[1]), minor: Number(match[2]) } : null;
+}
+
+export const majorMinor = (version) => {
+    const parsed = parseVersion(version);
+    return parsed ? `${parsed.major}.${parsed.minor}` : null;
+}
+
+const isBefore80 = (version) => {
+    const parsed = parseVersion(version);
+    return !!parsed && parsed.major < 8;
+}
+
+export const getServerVersion = async (connection) => {
+    try {
+        const rows = await connection.query('SELECT VERSION() AS version');
+        return rows?.[0]?.version ?? null;
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * The MySQL version a template was dumped from: recorded in dumpInfo.json by
+ * dump, or else inferred from how its SQL is written. Returns
+ * { version, inferred, reason? } or null when it can't tell.
+ */
+export const getTemplateVersion = async (dir) => {
+    try {
+        const info = JSON.parse(await fs.readFile(path.join(dir, 'dumpInfo.json'), 'utf-8'));
+        if (info.mysqlVersion) return { version: info.mysqlVersion, inferred: false };
+    } catch {
+        // No dumpInfo.json, or written before versions were recorded
+    }
+
+    let sql = '';
+    try {
+        for (const entry of await fs.readdir(dir, { withFileTypes: true })) {
+            if (!entry.isDirectory()) continue;
+            try {
+                const structure = JSON.parse(await fs.readFile(path.join(dir, entry.name, `${entry.name}.json`), 'utf-8'));
+                sql += Object.values(structure.tables || {}).map(t => t.createSQL || '').join('\n');
+            } catch {
+                // Not a database folder
+            }
+        }
+    } catch {
+        return null;
+    }
+    if (/utf8mb4_0900_|\butf8mb3\b/i.test(sql)) {
+        return { version: '8.0', inferred: true, reason: 'uses utf8mb4_0900 collations or utf8mb3, which only 8.0 prints' };
+    }
+    if (/\b(?:smallint|mediumint|int|bigint)\(\d+\)|\btinyint\((?!1\))\d+\)/i.test(sql)) {
+        return { version: '5.7', inferred: true, reason: 'shows integer display widths like int(11), as 5.7 and 8.0 before 8.0.19 do' };
+    }
+    if (/\b(?:smallint|mediumint|int|bigint)\b(?!\()/i.test(sql)) {
+        return { version: '8.0', inferred: true, reason: 'shows integers without display widths, as 8.0.19 and later do' };
+    }
+    return null;
+}
+
+/**
+ * What to know when the template and the server are different MySQL versions.
+ */
+export const versionNotes = (templateVersion, serverVersion) => {
+    const template = majorMinor(templateVersion);
+    const server = majorMinor(serverVersion);
+    if (!template || !server || template === server) return [];
+    const notes = [
+        `The template is from MySQL ${template} and the server is MySQL ${server}. Integer display widths (int(11) vs int), YEAR(4) and utf8 vs utf8mb3 are printed differently by these versions and are ignored when comparing.`
+    ];
+    if (isBefore80(serverVersion) && !isBefore80(templateVersion)) {
+        notes.push(`MySQL ${server} has no utf8mb4_0900 collations, so tables and columns are created with utf8mb4_unicode_ci (utf8mb4_bin for accent- or case-sensitive ones) instead.`);
+        notes.push(`Expression defaults such as DEFAULT (...) need MySQL 8.0.13 or later and fail on MySQL ${server}.`);
+    }
+    return notes;
+}
+
+export const getVersionInfo = async (connection, templateDir) => {
+    const server = await getServerVersion(connection);
+    const template = await getTemplateVersion(templateDir);
+    return { server, template, notes: versionNotes(template?.version, server) };
+}
+
+// MySQL 8 added the _0900_ collation family, which does not exist on 5.7. The _unicode_ci
+// collation of the same charset is accent- and case-insensitive like _0900_ai_ci and is
+// present on both versions, so a table created with it means the same thing either way.
+// Accent- or case-sensitive _0900_ collations map to the charset's _bin. Null if collation
+// isn't a _0900_ one.
+export const portableCollation = (collation) => {
+    const match = /^(\w+?)_0900_(\w+)$/i.exec(collation || '');
+    if (!match) return null;
+    return /^(?:ai_ci|as_ci)$/i.test(match[2]) ? `${match[1]}_unicode_ci` : `${match[1]}_bin`;
+}
+
+/**
+ * Rewrite SQL from a template so the server can run it: MySQL 5.7 doesn't
+ * know the utf8mb4_0900 collations that 8.0 uses by default, or the utf8mb3_
+ * collation names 8.0 prints.
+ */
+export const adaptSQLForServer = (sql, serverVersion) => {
+    if (typeof sql !== 'string' || !isBefore80(serverVersion)) return sql;
+    return sql
+        .replace(/\b\w+?_0900_\w+/gi, (collation) => portableCollation(collation) ?? collation)
+        .replace(/\butf8mb3_(\w+)/gi, 'utf8_$1');
+}

package/ui/README.md

@@ -1,40 +1,55 @@
-# MySQLsyncr (mysqlsyncr)
-
-A simple ui for the sync features in mysqlsyncr
-
-## Install the dependencies
-```bash
-yarn
-# or
-npm install
-```
-
-### Start the app in development mode (hot-code reloading, error reporting, etc.)
-```bash
-quasar dev
-```
-
-
-### Lint the files
-```bash
-yarn lint
-# or
-npm run lint
-```
-
-
-### Format the files
-```bash
-yarn format
-# or
-npm run format
-```
-
-
-### Build the app for production
-```bash
-quasar build
-```
-
-### Customize the configuration
-See [Configuring quasar.config.js](https://v2.quasar.dev/quasar-cli-vite/quasar-config-js).
+# MySQLsyncr (mysqlsyncr)
+
+A simple ui for the sync features in mysqlsyncr
+
+## Requirements
+
+Building or running the UI in development mode needs **Node.js 22.22.0 or later** (or 24, 26, 28, 30). The Quasar CLI (`@quasar/app-vite`) checks this itself and stops with "INCOMPATIBLE NODE VERSION" on anything older, even though its `package.json` accepts any Node 22.
+
+```bash
+node -v          # check
+nvm install 22   # then nvm use 22, if you use nvm
+```
+
+This only applies to building. `mysqlsyncr ui` serves the prebuilt files in `dist/spa`, and installing or running mysqlsyncr doesn't need these packages or this Node version.
+
+## Install the dependencies
+```bash
+yarn
+# or
+npm install
+```
+
+### Start the app in development mode (hot-code reloading, error reporting, etc.)
+```bash
+quasar dev
+```
+
+
+### Lint the files
+```bash
+yarn lint
+# or
+npm run lint
+```
+
+
+### Format the files
+```bash
+yarn format
+# or
+npm run format
+```
+
+
+### Build the app for production
+```bash
+npm run build
+# or
+quasar build
+```
+
+This writes the UI to `dist/spa`, which is what `mysqlsyncr ui` serves and what gets published. It's committed to the repository, so rebuild and commit it after changing anything in `src/`; otherwise the served UI won't include the change.
+
+### Customize the configuration
+See [Configuring quasar.config.js](https://v2.quasar.dev/quasar-cli-vite/quasar-config-js).

package/ui/dist/spa/assets/MainLayout-DLH1Kfg-.js

@@ -0,0 +1 @@
+import{A as e,C as t,D as n,E as r,F as i,I as a,L as o,M as s,N as c,O as l,P as u,R as d,S as f,T as p,_ as m,a as h,b as g,d as _,g as v,h as y,i as b,j as x,k as S,l as C,m as w,n as T,o as E,p as D,r as O,s as k,t as A,u as j,v as M,w as N,x as P,y as F}from"./index-Cqrg985P.js";var I=m({name:`QPageContainer`,setup(n,{slots:r}){let i=_(),a=p(w,D);if(a===D)return console.error(`QPageContainer needs to be child of QLayout`),D;e(y,!0);let o=F(()=>{let e={};return a.header.space&&(e.paddingTop=`${a.header.size}px`),a.right.space&&(e[`padding${i.lang.rtl?`Left`:`Right`}`]=`${a.right.size}px`),a.footer.space&&(e.paddingBottom=`${a.footer.size}px`),a.left.space&&(e[`padding${i.lang.rtl?`Right`:`Left`}`]=`${a.left.size}px`),e});return()=>t(`div`,{class:`q-page-container`,style:o.value},j(r.default))}});function L(e){let t=o({width:0,height:0}),i=f(),a=null,s=null,c=null,l=0,p,m={width:-1,height:-1};function h(){c!==null&&(clearTimeout(c),c=null)}function g(){if(h(),s===null)return;let{offsetWidth:e,offsetHeight:n}=a;(e!==m.width||n!==m.height)&&(m={width:e,height:n},t.value=m,p?.(m))}function _(){l>0?c===null&&(c=setTimeout(g,l)):g()}function v(){h(),s!==null&&(s.disconnect(),s=null)}let y=new u(()=>{let t=d(e)??{},n=C(t.target,i);l=Number(t.debounce)||0,p=t.onResize,n!==a&&(v(),a=n,m={width:-1,height:-1}),t.disabled===!0||a===null?v():s===null&&(s=new ResizeObserver(_),s.observe(a,{box:`border-box`}),g())});return y.scheduler=()=>{y.run()},i===null?y.run():(n(()=>{y.run()}),r(v)),{elementSize:t,refreshElementSize:g,stopElementSize(){v(),a=null,y.stop()}}}var{passive:R}=v;function z(e){let t=o({top:0,left:0}),i=a(`down`),s=a(!1),c=o({top:0,left:0}),l=o({top:0,left:0}),p={scrollPosition:t,scrollDirection:i,scrollDirectionChanged:s,scrollDelta:c,scrollInflectionPoint:l},m=f(),h=m!==null||N()?_():void 0,g=null,v=!1,y=null,x=`vertical`,S,w,T,D=0,k=0,A=`down`,j={top:0,left:0};function M(){y!==null&&(y(),y=null)}function P(){if(M(),g===null)return;let e=Math.max(0,E(g)),n=O(g),r=e-D,a=n-k;if(x===`vertical`&&r===0||x===`horizontal`&&a===0||r===0&&a===0)return;let o=Math.abs(r)>=Math.abs(a)?r<0?`up`:`down`:a<0?`left`:`right`,u=A!==o,d={top:e,left:n},f={top:r,left:a};D=e,k=n,t.value=d,c.value=f,s.value=u,u&&(A=o,j=d,i.value=o,l.value=d),T?.({position:d,direction:o,directionChanged:u,delta:f,inflectionPoint:j})}function F(){if(S===0)P();else if(y===null){if(S===void 0){let e=requestAnimationFrame(P);y=()=>{cancelAnimationFrame(e)}}else{let e=setTimeout(P,S);y=()=>{clearTimeout(e)}}}}function I(){M(),v&&=(g.removeEventListener(`scroll`,F,R),!1)}let L=new u(()=>{let n=d(e)??{},r=d(n.scrollTarget),a=C(n.target,m),o=r==null?a===null?null:b(a):b(a,r);x=n.axis??`vertical`,S=n.debounce===void 0||n.debounce===null?void 0:Number(n.debounce)||0,T=n.onScroll,o!==g&&(I(),g=o,(D!==0||k!==0)&&(D=k=0,t.value={top:D,left:k},c.value={top:D,left:k}),A!==`down`&&(A=`down`,i.value=A),s.value&&=!1,(j.top!==0||j.left!==0)&&(j={top:0,left:0},l.value=j));let u=h?.lang.rtl===!0,f=w!==void 0&&w!==u;w=u,n.disabled===!0||g===null?I():v?f&&P():(g.addEventListener(`scroll`,F,R),v=!0,P())});return L.scheduler=()=>{L.run()},m===null?L.run():(n(()=>{L.run()}),r(I)),{...p,refreshScroll:P,stopScroll(){I(),g=null,L.stop()}}}var B=/^(h|l)h(h|r) lpr (f|l)f(f|r)$/,V=m({name:`QLayout`,props:{container:Boolean,view:{type:String,default:`hhh lpr fff`,validator:e=>B.test(e.toLowerCase())},onScroll:Function,onScrollHeight:Function,onResize:Function},setup(n,{slots:r,emit:c}){let u=_(),d=o(null),f=o(null),p=()=>n.container?f.value:d.value,m=a(u.screen.height),g=a(n.container?0:u.screen.width),v=a({position:0,direction:`down`,inflectionPoint:0}),y=a(0),b=a(M.value?0:h()),x=F(()=>`q-layout q-layout--`+(n.container?`containerized`:`standard`)),S=F(()=>n.container?null:{minHeight:u.screen.height+`px`}),C=F(()=>b.value===0?null:{[u.lang.rtl?`left`:`right`]:`${b.value}px`}),E=F(()=>b.value===0?null:{[u.lang.rtl?`right`:`left`]:0,[u.lang.rtl?`left`:`right`]:`-${b.value}px`,width:`calc(100% + ${b.value}px)`}),D=null;function O(e){let t={position:e.position.top,direction:e.direction,directionChanged:e.directionChanged,inflectionPoint:e.inflectionPoint.top,delta:e.delta.top};n.container||!document.qScrollPrevented?(D=null,k(t)):D=t}function k(e){v.value=e,n.onScroll!==void 0&&c(`scroll`,e)}function N(e){let{height:t,width:r}=e,i=!1;m.value!==t&&(i=!0,m.value=t,n.onScrollHeight!==void 0&&c(`scrollHeight`,t),I()),g.value!==r&&(i=!0,g.value=r),i&&n.onResize!==void 0&&c(`resize`,e)}function P({height:e}){y.value!==e&&(y.value=e,I())}function I(){if(n.container){let e=m.value>y.value?h():0;b.value!==e&&(b.value=e)}}z({target:p,onScroll:O}),L({target:p,debounce:100,onResize:N}),L(()=>({target:d,debounce:100,disabled:n.container!==!0,onResize:P}));let R=null,B={instances:{},view:F(()=>n.view),isContainer:F(()=>n.container),rootRef:d,height:m,containerHeight:y,scrollbarWidth:b,totalWidth:F(()=>n.container?g.value+b.value:u.screen.width),rows:F(()=>{let e=n.view.toLowerCase().split(` `);return{top:[...e[0]],middle:[...e[1]],bottom:[...e[2]]}}),header:i({size:0,offset:0,space:!1}),right:i({size:300,offset:0,space:!1}),footer:i({size:0,offset:0,space:!1}),left:i({size:300,offset:0,space:!1}),scroll:v,animate(){R===null?document.body.classList.add(`q-body--layout-animate`):clearTimeout(R),R=setTimeout(()=>{R=null,document.body.classList.remove(`q-body--layout-animate`)},155)},update(e,t,n){B[e][t]=n}};e(w,B);{let e=()=>{if(D!==null){let e=D;D=null,k(e)}};A(e),l(()=>{T(e)})}if(h()>0){let e=null,t=document.documentElement,r=()=>{e=null,t.classList.remove(`hide-scrollbar`)},i=()=>{if(e===null){if(t.scrollHeight>u.screen.height)return;t.classList.add(`hide-scrollbar`)}else clearTimeout(e);e=setTimeout(r,300)},a=t=>{e!==null&&t===`remove`&&(clearTimeout(e),r()),window[`${t}EventListener`](`resize`,i)};s(()=>n.container?`remove`:`add`,a),n.container||a(`add`),l(()=>{a(`remove`)})}return()=>{let e=t(`div`,{class:x.value,style:S.value,ref:n.container?f:d,tabindex:-1},j(r.default));return n.container?t(`div`,{class:`q-layout-container overflow-hidden`,ref:d},[t(`div`,{class:`absolute-full`,style:C.value},[t(`div`,{class:`scroll`,style:E.value},[e])])]):e}}}),H={};function U(e,t){let n=x(`router-view`);return S(),g(V,{view:`lHh Lpr lFf`},{default:c(()=>[P(I,null,{default:c(()=>[P(n)]),_:1})]),_:1})}var W=k(H,[[`render`,U]]);export{W as default};

package/ui/dist/spa/assets/axios-2hQ_j_Tz.js

@@ -0,0 +1 @@
+import{c as e,f as t}from"./index-Cqrg985P.js";var n=e.create({baseURL:`/`}),r=t(({app:t})=>{t.config.globalProperties.$axios=e,t.config.globalProperties.$api=n});export{n as api,r as default};