feat(backup): support exact table selection by database and schema
This commit is contained in:
27 files changed
+741
-17
No files matched your search
Generated
+1
-1
@@ -61,4 +61,4 @@ ${this.parser.parse(e)}</blockquote>
|
||||
${e}</tr>
|
||||
`}tablecell(e){let t=this.parser.parseInline(e.tokens),n=e.header?`th`:`td`;return(e.align?`<${n} align="${e.align}">`:`<${n}>`)+t+`</${n}>
|
||||
`}strong({tokens:e}){return`<strong>${this.parser.parseInline(e)}</strong>`}em({tokens:e}){return`<em>${this.parser.parseInline(e)}</em>`}codespan({text:e}){return`<code>${ec(e,!0)}</code>`}br(e){return`<br>`}del({tokens:e}){return`<del>${this.parser.parseInline(e)}</del>`}link({href:e,title:t,tokens:n}){let r=this.parser.parseInline(n),i=tc(e);if(i===null)return r;e=i;let a=`<a href="`+e+`"`;return t&&(a+=` title="`+ec(t)+`"`),a+=`>`+r+`</a>`,a}image({href:e,title:t,text:n,tokens:r}){r&&(n=this.parser.parseInline(r,this.parser.textRenderer));let i=tc(e);if(i===null)return ec(n);e=i;let a=`<img src="${e}" alt="${ec(n)}"`;return t&&(a+=` title="${ec(t)}"`),a+=`>`,a}text(e){return`tokens`in e&&e.tokens?this.parser.parseInline(e.tokens):`escaped`in e&&e.escaped?e.text:ec(e.text)}},fc=class{strong({text:e}){return e}em({text:e}){return e}codespan({text:e}){return e}del({text:e}){return e}html({text:e}){return e}text({text:e}){return e}link({text:e}){return``+e}image({text:e}){return``+e}br(){return``}checkbox({raw:e}){return e}},pc=class e{options;renderer;textRenderer;constructor(e){this.options=e||Ho,this.options.renderer=this.options.renderer||new dc,this.renderer=this.options.renderer,this.renderer.options=this.options,this.renderer.parser=this,this.textRenderer=new fc}static parse(t,n){return new e(n).parse(t)}static parseInline(t,n){return new e(n).parseInline(t)}parse(e){this.renderer.parser=this;let t=``;for(let n=0;n<e.length;n++){let r=e[n];if(this.options.extensions?.renderers?.[r.type]){let e=r,n=this.options.extensions.renderers[e.type].call({parser:this},e);if(n!==!1||![`space`,`hr`,`heading`,`code`,`table`,`blockquote`,`list`,`html`,`def`,`paragraph`,`text`].includes(e.type)){t+=n||``;continue}}let i=r;switch(i.type){case`space`:t+=this.renderer.space(i);break;case`hr`:t+=this.renderer.hr(i);break;case`heading`:t+=this.renderer.heading(i);break;case`code`:t+=this.renderer.code(i);break;case`table`:t+=this.renderer.table(i);break;case`blockquote`:t+=this.renderer.blockquote(i);break;case`list`:t+=this.renderer.list(i);break;case`checkbox`:t+=this.renderer.checkbox(i);break;case`html`:t+=this.renderer.html(i);break;case`def`:t+=this.renderer.def(i);break;case`paragraph`:t+=this.renderer.paragraph(i);break;case`text`:t+=this.renderer.text(i);break;default:{let e=`Token with "`+i.type+`" type was not found.`;if(this.options.silent)return console.error(e),``;throw Error(e)}}}return t}parseInline(e,t=this.renderer){this.renderer.parser=this;let n=``;for(let r=0;r<e.length;r++){let i=e[r];if(this.options.extensions?.renderers?.[i.type]){let e=this.options.extensions.renderers[i.type].call({parser:this},i);if(e!==!1||![`escape`,`html`,`link`,`image`,`strong`,`em`,`codespan`,`br`,`del`,`text`].includes(i.type)){n+=e||``;continue}}let a=i;switch(a.type){case`escape`:n+=t.text(a);break;case`html`:n+=t.html(a);break;case`link`:n+=t.link(a);break;case`image`:n+=t.image(a);break;case`checkbox`:n+=t.checkbox(a);break;case`strong`:n+=t.strong(a);break;case`em`:n+=t.em(a);break;case`codespan`:n+=t.codespan(a);break;case`br`:n+=t.br(a);break;case`del`:n+=t.del(a);break;case`text`:n+=t.text(a);break;default:{let e=`Token with "`+a.type+`" type was not found.`;if(this.options.silent)return console.error(e),``;throw Error(e)}}}return n}},mc=class{options;block;constructor(e){this.options=e||Ho}static passThroughHooks=new Set([`preprocess`,`postprocess`,`processAllTokens`,`emStrongMask`]);static passThroughHooksRespectAsync=new Set([`preprocess`,`postprocess`,`processAllTokens`]);preprocess(e){return e}postprocess(e){return e}processAllTokens(e){return e}emStrongMask(e){return e}provideLexer(e=this.block){return e?uc.lex:uc.lexInline}provideParser(e=this.block){return e?pc.parse:pc.parseInline}},hc=class{defaults=Vo();options=this.setOptions;parse=this.parseMarkdown(!0);parseInline=this.parseMarkdown(!1);Parser=pc;Renderer=dc;TextRenderer=fc;Lexer=uc;Tokenizer=lc;Hooks=mc;constructor(...e){this.use(...e)}walkTokens(e,t){let n=[];for(let r of e)switch(n=n.concat(t.call(this,r)),r.type){case`table`:{let e=r;for(let r of e.header)n=n.concat(this.walkTokens(r.tokens,t));for(let r of e.rows)for(let e of r)n=n.concat(this.walkTokens(e.tokens,t));break}case`list`:{let e=r;n=n.concat(this.walkTokens(e.items,t));break}default:{let e=r;this.defaults.extensions?.childTokens?.[e.type]?this.defaults.extensions.childTokens[e.type].forEach(r=>{let i=e[r].flat(1/0);n=n.concat(this.walkTokens(i,t))}):e.tokens&&(n=n.concat(this.walkTokens(e.tokens,t)))}}return n}use(...e){let t=this.defaults.extensions||{renderers:{},childTokens:{}};return e.forEach(e=>{let n={...e};if(n.async=this.defaults.async||n.async||!1,e.extensions&&(e.extensions.forEach(e=>{if(!e.name)throw Error(`extension name required`);if(`renderer`in e){let n=t.renderers[e.name];n?t.renderers[e.name]=function(...t){let r=e.renderer.apply(this,t);return r===!1&&(r=n.apply(this,t)),r}:t.renderers[e.name]=e.renderer}if(`tokenizer`in e){if(!e.level||e.level!==`block`&&e.levelLine truncated
|
||||
Please report this to https://github.com/markedjs/marked.`,e){let e=`<p>An error occurred:</p><pre>`+ec(n.message+``,!0)+`</pre>`;return t?Promise.resolve(e):e}if(t)return Promise.reject(n);throw n}}},gc=new hc;function $(e,t){return gc.parse(e,t)}$.options=$.setOptions=function(e){return gc.setOptions(e),$.defaults=gc.defaults,Uo($.defaults),$},$.getDefaults=Vo,$.defaults=Ho,$.use=function(...e){return gc.use(...e),$.defaults=gc.defaults,Uo($.defaults),$},$.walkTokens=function(e,t){return gc.walkTokens(e,t)},$.parseInline=gc.parseInline,$.Parser=pc,$.parser=pc.parse,$.Renderer=dc,$.TextRenderer=fc,$.Lexer=uc,$.lexer=uc.lex,$.Tokenizer=lc,$.Hooks=mc,$.parse=$,$.options,$.setOptions,$.use,$.walkTokens,$.parseInline,pc.parse,uc.lex;function _c(e){return String(e??``).replace(/&/g,`&`).replace(/</g,`<`).replace(/>/g,`>`).replace(/"/g,`"`).replace(/'/g,`'`)}var vc=/^(https?:|mailto:)/i;function yc(e){let t=String(e??``).trim();return t===``||/^[/\\]{2}/.test(t)?null:t.startsWith(`#`)||t.startsWith(`/`)||t.startsWith(`./`)||t.startsWith(`../`)||vc.test(t)?t:null}var bc=new hc({renderer:{html({text:e}){return _c(e)},link({href:e,title:t,tokens:n}){let r=this.parser.parseInline(n),i=yc(e);if(i===null)return r;let a=t?` title="${_c(t)}"`:``;return`<a href="${_c(i)}"${a}>${r}</a>`},image({href:e,title:t,text:n}){let r=yc(e);if(r===null)return _c(n);let i=t?` title="${_c(t)}"`:``;return`<img src="${_c(r)}" alt="${_c(n)}"${i}>`}}});function xc(e){return e===null||e.trim()===``?``:bc.parse(e)}var Sc={class:`text-sm text-muted-foreground`},Cc=[`title`,`innerHTML`],wc=L({__name:`NoteEditor`,props:{modelValue:{},readonly:{type:Boolean},translate:{type:Function}},emits:[`update:modelValue`],setup(e,{emit:t}){let n=e,r=t,i=P(!1),a=P(``),o=P(null);async function s(){n.readonly||(a.value=n.modelValue,i.value=!0,await hn(),o.value?.focus())}function c(){i.value=!1,a.value!==n.modelValue&&r(`update:modelValue`,a.value)}function l(){a.value=n.modelValue,i.value=!1}return(t,n)=>(U(),W(`div`,Sc,[i.value?On((U(),W(`textarea`,{key:0,ref_key:`input`,ref:o,"onUpdate:modelValue":n[0]||=e=>a.value=e,rows:`4`,class:`w-full resize-y rounded border border-border bg-background p-2 font-mono text-xs text-foreground outline-none focus:border-ring`,onBlur:n[1]||=e=>c(),onKeydown:n[2]||=lo(e=>l(),[`escape`])},null,544)),[[to,a.value]]):e.modelValue.trim()===``?e.readonly?q(``,!0):(U(),W(`button`,{key:2,type:`button`,class:`rounded border border-dashed border-border px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-muted/40`,onClick:n[4]||=e=>s()},O(e.translate(`docs.addNote`)),1)):(U(),W(`div`,{key:1,class:D([`leading-relaxed`,e.readonly?``:`cursor-text rounded transition-colors hover:bg-muted/30`]),title:e.readonly?void 0:e.translate(`docs.editNote`),onClick:n[3]||=e=>s(),innerHTML:F(xc)(e.modelValue)},null,10,Cc))]))}}),Tc={class:`flex flex-col gap-5`},Ec={class:`flex flex-col gap-2`},Dc={class:`flex flex-wrap items-center gap-2`},Oc={class:`font-mono text-lg font-semibold text-foreground`},kc={key:0,class:`rounded bg-muted/50 px-1.5 py-0.5 text-[10px] uppercase text-muted-foreground`},Ac={class:`mb-1.5 text-xs font-semibold uppercase tracking-wide text-muted-foreground`},jc={class:`flex flex-wrap gap-1`},Mc={class:`mb-1.5 text-xs font-semibold uppercase tracking-wide text-muted-foreground`},Nc={key:0,class:`text-xs text-muted-foreground`},Pc={key:1,class:`flex flex-col gap-1`},Fc=[`onClick`],Ic=L({__name:`EnumPage`,props:{enumType:{},snapshot:{},translate:{type:Function}},emits:[`select`],setup(e,{emit:t}){let n=e,r=t,i=Y(()=>n.enumType.schema?`${n.enumType.schema}.${n.enumType.name}`:n.enumType.name),a=Y(()=>Bo(n.snapshot,n.enumType.name));return(t,n)=>(U(),W(`article`,Tc,[G(`header`,Ec,[G(`div`,Dc,[G(`h2`,Oc,O(i.value),1),e.enumType.synthesized?(U(),W(`span`,kc,`synthesized`)):q(``,!0)]),K(wc,{"model-value":e.enumType.note??``,readonly:``,translate:e.translate},null,8,[`model-value`,`translate`])]),G(`section`,null,[G(`h3`,Ac,O(e.translate(`docs.enumValues`)),1),G(`ul`,jc,[(U(!0),W(V,null,R(e.enumType.values,e=>(U(),W(`li`,{key:e,class:`rounded bg-muted/50 px-1.5 py-0.5 font-mono text-[11px] text-foreground`},O(e),1))),128))])]),G(`section`,null,[G(`h3`,Mc,O(e.translate(`docs.usedBy`)),1),a.value.length===0?(U(),W(`p`,Nc,`No column uses this enum.`)):(U(),W(`ul`,Pc,[(U(!0),W(V,null,R(a.value,e=>(U(),W(`li`,{key:`${e.tableKey}.${e.column}`,class:`text-xs`},[G(`button`,{type:`button`,class:`w-full rounded border border-border bg-background px-2 py-1.5 text-left font-mono transition-colors hover:bg-muted/40`,onClick:t=>r(`select`,e.tableKey)},O(e.tableKey)+`.`+O(e.column),9,Fc)]))),128))]))])]))}}),Lc={class:`flex flex-col gap-3`},Rc={class:`flex flex-col gap-1`},zc={class:`text-[10px] uppercase tracking-wide text-muted-foreground`},Bc=[`value`,`placeholder`],Vc={class:`flex flex-col gap-2`},Hc={class:`text-[10px] uppercase tracking-wide text-muted-foreground`},Uc={class:`flex items-center gap-1.5`},Wc=[`t
Line truncated
|
||||
Please report this to https://github.com/markedjs/marked.`,e){let e=`<p>An error occurred:</p><pre>`+ec(n.message+``,!0)+`</pre>`;return t?Promise.resolve(e):e}if(t)return Promise.reject(n);throw n}}},gc=new hc;function $(e,t){return gc.parse(e,t)}$.options=$.setOptions=function(e){return gc.setOptions(e),$.defaults=gc.defaults,Uo($.defaults),$},$.getDefaults=Vo,$.defaults=Ho,$.use=function(...e){return gc.use(...e),$.defaults=gc.defaults,Uo($.defaults),$},$.walkTokens=function(e,t){return gc.walkTokens(e,t)},$.parseInline=gc.parseInline,$.Parser=pc,$.parser=pc.parse,$.Renderer=dc,$.TextRenderer=fc,$.Lexer=uc,$.lexer=uc.lex,$.Tokenizer=lc,$.Hooks=mc,$.parse=$,$.options,$.setOptions,$.use,$.walkTokens,$.parseInline,pc.parse,uc.lex;function _c(e){return String(e??``).replace(/&/g,`&`).replace(/</g,`<`).replace(/>/g,`>`).replace(/"/g,`"`).replace(/'/g,`'`)}var vc=/^(https?:|mailto:)/i;function yc(e){let t=String(e??``).trim();return t===``||/^[/\\]{2}/.test(t)?null:t.startsWith(`#`)||t.startsWith(`/`)||t.startsWith(`./`)||t.startsWith(`../`)||vc.test(t)?t:null}var bc=new hc({renderer:{html({text:e}){return _c(e)},link({href:e,title:t,tokens:n}){let r=this.parser.parseInline(n),i=yc(e);if(i===null)return r;let a=t?` title="${_c(t)}"`:``;return`<a href="${_c(i)}"${a}>${r}</a>`},image({href:e,title:t,text:n}){let r=yc(e);if(r===null)return _c(n);let i=t?` title="${_c(t)}"`:``;return`<img src="${_c(r)}" alt="${_c(n)}"${i}>`}}});function xc(e){return e===null||e.trim()===``?``:bc.parse(e)}var Sc={class:`text-sm text-muted-foreground`},Cc=[`title`,`innerHTML`],wc=L({__name:`NoteEditor`,props:{modelValue:{},readonly:{type:Boolean},translate:{type:Function}},emits:[`update:modelValue`],setup(e,{emit:t}){let n=e,r=t,i=P(!1),a=P(``),o=P(null);async function s(){n.readonly||(a.value=n.modelValue,i.value=!0,await hn(),o.value?.focus())}function c(){i.value=!1,a.value!==n.modelValue&&r(`update:modelValue`,a.value)}function l(){a.value=n.modelValue,i.value=!1}return(t,n)=>(U(),W(`div`,Sc,[i.value?On((U(),W(`textarea`,{key:0,ref_key:`input`,ref:o,"onUpdate:modelValue":n[0]||=e=>a.value=e,rows:`4`,class:`w-full resize-y rounded border border-border bg-background p-2 font-mono text-xs text-foreground outline-none focus:border-ring`,onBlur:n[1]||=e=>c(),onKeydown:n[2]||=lo(e=>l(),[`escape`])},null,544)),[[to,a.value]]):e.modelValue.trim()===``?e.readonly?q(``,!0):(U(),W(`button`,{key:2,type:`button`,class:`rounded border border-dashed border-border px-2 py-1 text-xs text-muted-foreground transition-colors hover:bg-muted/40`,onClick:n[4]||=e=>s()},O(e.translate(`docs.addNote`)),1)):(U(),W(`div`,{key:1,class:D([`leading-relaxed`,e.readonly?``:`cursor-text rounded transition-colors hover:bg-muted/30`]),title:e.readonly?void 0:e.translate(`docs.editNote`),onClick:n[3]||=e=>s(),innerHTML:F(xc)(e.modelValue)},null,10,Cc))]))}}),Tc={class:`flex flex-col gap-5`},Ec={class:`flex flex-col gap-2`},Dc={class:`flex flex-wrap items-center gap-2`},Oc={class:`font-mono text-lg font-semibold text-foreground`},kc={key:0,class:`rounded bg-muted/50 px-1.5 py-0.5 text-[10px] uppercase text-muted-foreground`},Ac={class:`mb-1.5 text-xs font-semibold uppercase tracking-wide text-muted-foreground`},jc={class:`flex flex-wrap gap-1`},Mc={class:`mb-1.5 text-xs font-semibold uppercase tracking-wide text-muted-foreground`},Nc={key:0,class:`text-xs text-muted-foreground`},Pc={key:1,class:`flex flex-col gap-1`},Fc=[`onClick`],Ic=L({__name:`EnumPage`,props:{enumType:{},snapshot:{},translate:{type:Function}},emits:[`select`],setup(e,{emit:t}){let n=e,r=t,i=Y(()=>n.enumType.schema?`${n.enumType.schema}.${n.enumType.name}`:n.enumType.name),a=Y(()=>Bo(n.snapshot,n.enumType.name));return(t,n)=>(U(),W(`article`,Tc,[G(`header`,Ec,[G(`div`,Dc,[G(`h2`,Oc,O(i.value),1),e.enumType.synthesized?(U(),W(`span`,kc,`synthesized`)):q(``,!0)]),K(wc,{"model-value":e.enumType.note??``,readonly:``,translate:e.translate},null,8,[`model-value`,`translate`])]),G(`section`,null,[G(`h3`,Ac,O(e.translate(`docs.enumValues`)),1),G(`ul`,jc,[(U(!0),W(V,null,R(e.enumType.values,e=>(U(),W(`li`,{key:e,class:`rounded bg-muted/50 px-1.5 py-0.5 font-mono text-[11px] text-foreground`},O(e),1))),128))])]),G(`section`,null,[G(`h3`,Mc,O(e.translate(`docs.usedBy`)),1),a.value.length===0?(U(),W(`p`,Nc,`No column uses this enum.`)):(U(),W(`ul`,Pc,[(U(!0),W(V,null,R(a.value,e=>(U(),W(`li`,{key:`${e.tableKey}.${e.column}`,class:`text-xs`},[G(`button`,{type:`button`,class:`w-full rounded border border-border bg-background px-2 py-1.5 text-left font-mono transition-colors hover:bg-muted/40`,onClick:t=>r(`select`,e.tableKey)},O(e.tableKey)+`.`+O(e.column),9,Fc)]))),128))]))])]))}}),Lc={class:`flex flex-col gap-3`},Rc={class:`flex flex-col gap-1`},zc={class:`text-[10px] uppercase tracking-wide text-muted-foreground`},Bc=[`value`,`placeholder`],Vc={class:`flex flex-col gap-2`},Hc={class:`text-[10px] uppercase tracking-wide text-muted-foreground`},Uc={class:`flex items-center gap-1.5`},Wc=[`t
Line truncated
|
||||
@@ -36,7 +36,7 @@
|
||||
"apps/desktop/src/i18n/locales/docs/pt-BR.ts": "f92c0b95b1b807c60a5136677808ed5014d9061dffd970aa5866eb1c82300dc5",
|
||||
"apps/desktop/src/i18n/locales/docs/zh-CN.ts": "2092c39277f2a6774405124d1f167bbcbc5f633d8f82bbd2b28ff5e12d78f3f7",
|
||||
"apps/desktop/src/i18n/locales/docs/zh-TW.ts": "691cf502248dbd09358c6c276990945013b26c52fb682bcd56b26f378daea29c",
|
||||
"apps/desktop/src/lib/app/localeOptions.ts": "3d33acbe797f75ca8de745ca572f71c0be4dc5fbb00714291b7a9db2d0345086",
|
||||
"apps/desktop/src/lib/app/localeOptions.ts": "ce38be921d938dbd97d22fde6035699fe40380be3eb4af2caa5371bacca0d945",
|
||||
"apps/desktop/src/lib/common/utils.ts": "76c4b2af1e03edeb8db389d9b2c1b56b72a57a1b5198d4e224671c1445c527da",
|
||||
"apps/desktop/src/lib/diagram/erDiagram.ts": "c22416a9a5ec5e619acc2d8bc5451254a25abe29fc518e9fb4f611e076fe7b1f",
|
||||
"apps/desktop/src/styles/tokens.css": "5b8f747a1eb93905dd797ed2c97b4aa3d18ebed866c2e1f150ff0d9cf52162f5",
|
||||
|
||||
@@ -233,6 +233,7 @@ impl BackupService {
|
||||
}
|
||||
// Metadata discovery may be slow; finish it before starting the snapshot idle timeout.
|
||||
let mut targets = Vec::new();
|
||||
let mut found_selected_tables = std::collections::HashSet::new();
|
||||
for schema_name in &schemas {
|
||||
check_cancel(stop)?;
|
||||
let mut selected_tables = Vec::new();
|
||||
@@ -250,7 +251,21 @@ impl BackupService {
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
let exact_names = job
|
||||
.config
|
||||
.selected_tables
|
||||
.iter()
|
||||
.filter(|target| target.database == *database && target.schema == *schema_name)
|
||||
.map(|target| target.table.as_str())
|
||||
.collect::<std::collections::HashSet<_>>();
|
||||
for table in &tables {
|
||||
if job.config.table_filter_mode == "selected" {
|
||||
if exact_names.contains(table.name.as_str()) {
|
||||
selected_tables.push(table.name.clone());
|
||||
found_selected_tables.insert((schema_name.as_str(), table.name.clone()));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let matched = job
|
||||
.config
|
||||
.table_patterns
|
||||
@@ -264,7 +279,7 @@ impl BackupService {
|
||||
}
|
||||
}
|
||||
}
|
||||
let included = if job.config.table_filter_mode == "include" {
|
||||
let included = if matches!(job.config.table_filter_mode.as_str(), "include" | "selected") {
|
||||
selected_tables.len()
|
||||
} else {
|
||||
tables.len() - excluded_tables.len()
|
||||
@@ -276,6 +291,21 @@ impl BackupService {
|
||||
}
|
||||
targets.push((schema_name.clone(), selected_tables, excluded_tables));
|
||||
}
|
||||
if job.config.table_filter_mode == "selected" {
|
||||
let missing = job
|
||||
.config
|
||||
.selected_tables
|
||||
.iter()
|
||||
.filter(|target| {
|
||||
target.database == *database
|
||||
&& !found_selected_tables.contains(&(target.schema.as_str(), target.table.clone()))
|
||||
})
|
||||
.map(|target| format!("{}.{}.{}", target.database, target.schema, target.table))
|
||||
.collect::<Vec<_>>();
|
||||
if !missing.is_empty() {
|
||||
return Err(format!("Selected backup tables are unavailable: {}", missing.join(", ")));
|
||||
}
|
||||
}
|
||||
if targets.is_empty() {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ mod store;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
pub use models::{BackupConfig, BackupFile, BackupRun, BackupSchedule, Migration, RunRequest};
|
||||
pub use models::{BackupConfig, BackupFile, BackupRun, BackupSchedule, BackupTableTarget, Migration, RunRequest};
|
||||
pub use service::{BackupCommand, BackupService};
|
||||
pub use store::{BackupSnapshot, BackupStore};
|
||||
|
||||
|
||||
@@ -5,6 +5,14 @@ use serde::{Deserialize, Serialize};
|
||||
pub const DEFAULT_DIRECTORY: &str = "dbx-backup__{schedule}__{timestamp}__{runId}";
|
||||
pub const DEFAULT_FILE: &str = "dbx-backup__{schedule}__{timestamp}__{database}__{runId}";
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct BackupTableTarget {
|
||||
pub database: String,
|
||||
pub schema: String,
|
||||
pub table: String,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct BackupConfig {
|
||||
@@ -15,6 +23,8 @@ pub struct BackupConfig {
|
||||
pub table_filter_mode: String,
|
||||
#[serde(default)]
|
||||
pub table_patterns: Vec<String>,
|
||||
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||
pub selected_tables: Vec<BackupTableTarget>,
|
||||
pub destination_directory: String,
|
||||
pub include_structure: bool,
|
||||
pub include_data: bool,
|
||||
@@ -145,7 +155,7 @@ impl BackupConfig {
|
||||
if !matches!(self.output_compression.as_str(), "none" | "gzip") {
|
||||
return Err("Unsupported backup compression".into());
|
||||
}
|
||||
if !matches!(self.table_filter_mode.as_str(), "all" | "include" | "exclude") {
|
||||
if !matches!(self.table_filter_mode.as_str(), "all" | "include" | "exclude" | "selected") {
|
||||
return Err("Unsupported backup table filter".into());
|
||||
}
|
||||
if self.databases.len() > 10_000 || self.table_patterns.len() > 1000 {
|
||||
@@ -154,9 +164,25 @@ impl BackupConfig {
|
||||
for value in self.databases.iter().chain(self.table_patterns.iter()) {
|
||||
bounded_text(value, 1024, "Backup target")?;
|
||||
}
|
||||
if self.table_filter_mode != "all" && self.table_patterns.is_empty() {
|
||||
if matches!(self.table_filter_mode.as_str(), "include" | "exclude") && self.table_patterns.is_empty() {
|
||||
return Err("Select backup table patterns".into());
|
||||
}
|
||||
if self.table_filter_mode == "selected" {
|
||||
if self.databases.is_empty() || self.selected_tables.is_empty() {
|
||||
return Err("Select backup databases and tables".into());
|
||||
}
|
||||
if self.selected_tables.len() > 10_000 {
|
||||
return Err("Too many selected backup tables".into());
|
||||
}
|
||||
for target in &self.selected_tables {
|
||||
bounded_text(&target.database, 1024, "Backup table database")?;
|
||||
bounded_text(&target.schema, 1024, "Backup table schema")?;
|
||||
bounded_text(&target.table, 1024, "Backup table name")?;
|
||||
if !self.databases.contains(&target.database) {
|
||||
return Err("Selected backup table is outside the database scope".into());
|
||||
}
|
||||
}
|
||||
}
|
||||
validate_template(self.file_name_pattern.as_deref().unwrap_or(DEFAULT_FILE), false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,29 @@ fn invalid_schedule_and_path_templates_are_rejected() {
|
||||
assert!(super::models::matches_pattern("PUBLIC.*", "users", "app", "public", false));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn exact_backup_scope_preserves_literal_names_and_rejects_empty_or_foreign_scope() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let mut config = schedule(dir.path()).config;
|
||||
let legacy = serde_json::to_value(&config).unwrap();
|
||||
assert!(legacy.get("selectedTables").is_none());
|
||||
assert!(serde_json::from_value::<BackupConfig>(legacy).unwrap().selected_tables.is_empty());
|
||||
config.table_filter_mode = "selected".into();
|
||||
assert!(config.validate().is_err());
|
||||
config.databases = vec!["app".into()];
|
||||
assert!(config.validate().is_err());
|
||||
config.selected_tables =
|
||||
vec![BackupTableTarget { database: "app".into(), schema: "a.b".into(), table: " odd*,?;客户'表 ".into() }];
|
||||
assert!(config.validate().is_ok());
|
||||
let roundtrip: BackupConfig = serde_json::from_value(serde_json::to_value(&config).unwrap()).unwrap();
|
||||
assert_eq!(roundtrip.selected_tables, config.selected_tables);
|
||||
config.selected_tables[0].database = "other".into();
|
||||
assert!(config.validate().unwrap_err().contains("outside"));
|
||||
config.selected_tables[0].database = "app".into();
|
||||
config.selected_tables[0].schema = String::new();
|
||||
assert!(config.validate().is_err());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn schedule_survives_reopen_and_rejects_stale_edit() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
@@ -438,6 +461,42 @@ async fn live_mysql_worker_scenario() {
|
||||
assert!(completed.error.as_deref().unwrap().contains("No tables matched"));
|
||||
assert!(completed.files.is_empty());
|
||||
assert!(previous.unwrap().exists());
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
"mysql",
|
||||
&database,
|
||||
"CREATE TABLE `odd*,name.with.dot` (id INT PRIMARY KEY, value TEXT)",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
"mysql",
|
||||
&database,
|
||||
"INSERT INTO `odd*,name.with.dot` VALUES (17, 'mysql-exact-scope-sentinel')",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
let mut exact = plan_with_id(dir.path(), "mysql-exact");
|
||||
exact.config.connection_id = "mysql".into();
|
||||
exact.config.databases = vec![database.clone()];
|
||||
exact.config.table_filter_mode = "selected".into();
|
||||
exact.config.selected_tables = vec![BackupTableTarget {
|
||||
database: database.clone(),
|
||||
schema: database.clone(),
|
||||
table: "odd*,name.with.dot".into(),
|
||||
}];
|
||||
service.command(BackupCommand::Save { schedule: exact }).await?;
|
||||
let exact_run = enqueue_and_run(&service, "mysql-exact").await;
|
||||
assert_eq!(exact_run.status, "success", "{:?}", exact_run.error);
|
||||
assert_eq!(exact_run.files.len(), 1);
|
||||
let exact_sql = read_backup(&exact_run.files[0].file_path, false);
|
||||
assert!(exact_sql.contains("mysql-exact-scope-sentinel"));
|
||||
assert!(exact_sql.contains("odd*,name.with.dot"));
|
||||
assert!(!exact_sql.contains("CREATE TABLE `chosen`"));
|
||||
assert!(!exact_sql.contains("CREATE TABLE `skipped`"));
|
||||
Ok::<_, String>(())
|
||||
})
|
||||
.catch_unwind()
|
||||
@@ -533,6 +592,7 @@ fn live_postgres_worker_exports_selected_tables_across_schemas() {
|
||||
service.state.storage.save_connections(std::slice::from_ref(&admin)).await.unwrap();
|
||||
service.state.configs.write().await.insert(admin.id.clone(), admin);
|
||||
let database = format!("dbx_pg_backup_{}", uuid::Uuid::new_v4().simple());
|
||||
eprintln!("Backup source test database: {database}");
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
admin_id,
|
||||
@@ -591,6 +651,129 @@ fn live_postgres_worker_exports_selected_tables_across_schemas() {
|
||||
// A view inside the same schema is not part of a table-name scope.
|
||||
assert!(!sql.contains("big_orders"), "{sql}");
|
||||
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
"postgres",
|
||||
&database,
|
||||
"CREATE TABLE app.\"odd*,name.with.dot\" (id integer PRIMARY KEY, note text)",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
"postgres",
|
||||
&database,
|
||||
"CREATE TABLE audit.\"odd*,name.with.dot\" (id integer PRIMARY KEY, note text)",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
"postgres",
|
||||
&database,
|
||||
"INSERT INTO app.\"odd*,name.with.dot\" VALUES (17, 'exact-scope-sentinel')",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
let mut exact = plan_with_id(dir.path(), "exact");
|
||||
exact.config.connection_id = "postgres".into();
|
||||
exact.config.databases = vec![database.clone()];
|
||||
exact.config.table_filter_mode = "selected".into();
|
||||
exact.config.selected_tables = vec![BackupTableTarget {
|
||||
database: database.clone(),
|
||||
schema: "app".into(),
|
||||
table: "odd*,name.with.dot".into(),
|
||||
}];
|
||||
service.command(BackupCommand::Save { schedule: exact.clone() }).await.unwrap();
|
||||
let exact_run = enqueue_and_run(&service, "exact").await;
|
||||
assert_eq!(exact_run.status, "success", "{:?}", exact_run.error);
|
||||
assert_eq!(exact_run.files.len(), 1);
|
||||
assert_eq!(exact_run.files[0].schema, "app");
|
||||
let exact_sql = read_backup(&exact_run.files[0].file_path, false);
|
||||
assert!(exact_sql.contains("odd*,name.with.dot"));
|
||||
assert!(exact_sql.contains("exact-scope-sentinel"));
|
||||
assert!(!exact_sql.contains("orders"));
|
||||
assert!(!exact_sql.contains("accounts"));
|
||||
assert!(!exact_sql.contains("audit"));
|
||||
// Replay the real exported SQL into another disposable database.
|
||||
let restore_database = format!("dbx_pg_backup_restore_{}", uuid::Uuid::new_v4().simple());
|
||||
eprintln!("Backup replay test database: {restore_database}");
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
admin_id,
|
||||
"postgres",
|
||||
&format!("CREATE DATABASE \"{restore_database}\""),
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
let restore_config = live_postgres_config("postgres-restore", &restore_database);
|
||||
service.state.storage.save_connections(std::slice::from_ref(&restore_config)).await.unwrap();
|
||||
service.state.configs.write().await.insert(restore_config.id.clone(), restore_config);
|
||||
// Selected-table dumps retain their source schema. Prepare the matching
|
||||
// namespace, as a restore into an existing application database does.
|
||||
execute_sql_statement(&service.state, "postgres-restore", &restore_database, "CREATE SCHEMA app", None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
for statement in
|
||||
crate::sql::split_sql_statements_for_database(&exact_sql, crate::models::connection::DatabaseType::Postgres)
|
||||
{
|
||||
execute_sql_statement(&service.state, "postgres-restore", &restore_database, &statement, None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
let restored = execute_sql_statement(
|
||||
&service.state,
|
||||
"postgres-restore",
|
||||
&restore_database,
|
||||
"SELECT id, note FROM app.\"odd*,name.with.dot\"",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(restored.rows, vec![vec![json!(17), json!("exact-scope-sentinel")]]);
|
||||
let absent = execute_sql_statement(
|
||||
&service.state,
|
||||
"postgres-restore",
|
||||
&restore_database,
|
||||
"SELECT to_regclass('app.orders'), to_regclass('public.accounts')",
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(absent.rows, vec![vec![serde_json::Value::Null, serde_json::Value::Null]]);
|
||||
execute_sql_statement(
|
||||
&service.state,
|
||||
admin_id,
|
||||
"postgres",
|
||||
&format!("DROP DATABASE \"{restore_database}\" WITH (FORCE)"),
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
exact.id = "exact-missing".into();
|
||||
exact.config.selected_tables.push(BackupTableTarget {
|
||||
database: database.clone(),
|
||||
schema: "missing_schema".into(),
|
||||
table: "not_there".into(),
|
||||
});
|
||||
service.command(BackupCommand::Save { schedule: exact }).await.unwrap();
|
||||
let missing_run = enqueue_and_run(&service, "exact-missing").await;
|
||||
assert_eq!(missing_run.status, "failed");
|
||||
assert!(missing_run.error.as_deref().unwrap().contains("unavailable"));
|
||||
assert!(missing_run.files.is_empty());
|
||||
|
||||
// Patterns are case-sensitive on PostgreSQL, and a scope that matches
|
||||
// nothing must fail without leaving a partial file behind.
|
||||
let mut empty = plan_with_id(dir.path(), "empty");
|
||||
|
||||
Reference in new issue
Block a user