PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FIX (mysql/mariadb): Drop extended inserts toggle, batch INSERTs always (issue #630)
Rostislav Dugin110f2102c259
diff --git a/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc.go b/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc.goindex 7ae51208..00010d80 100644--- a/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc.go+++ b/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc.go@@ -130,13 +130,6 @@ func (uc *CreateMariadbBackupUsecase) buildMariadbDumpArgs("--verbose",}- // One INSERT per row caps mariadb-dump memory on huge tables, but bloats the- // dump and makes restores far slower. Opting into extended inserts batches- // rows (mariadb-dump's default) for fast restores at higher backup memory.- if !mdb.IsUseExtendedInsert {- args = append(args, "--skip-extended-insert")- }-if mdb.HasPrivilege("TRIGGER") {args = append(args, "--triggers")}diff --git a/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc_test.go b/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc_test.goindex 9b10de56..ba01bc99 100644--- a/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc_test.go+++ b/backend/internal/features/backups/backups/usecases/logical/mariadb/create_backup_uc_test.go@@ -9,31 +9,21 @@ import ("databasus-backend/internal/util/tools")-func Test_BuildMariadbDumpArgs_WhenExtendedInsertDisabled_SkipsExtendedInsert(t *testing.T) {+// One INSERT per row costs ~127x on restore and saves no memory: with --quick the+// dumper streams rows and caps a batched statement at net_buffer_length (~1 MB)+// however large the table is (issue #630).+func Test_BuildMariadbDumpArgs_ForAnyDatabase_NeverSkipsExtendedInsert(t *testing.T) {uc := &CreateMariadbBackupUsecase{}database := &mariadbtypes.MariadbDatabase{- Version: tools.MariadbVersion1011,- IsUseExtendedInsert: false,+ Version: tools.MariadbVersion1011,+ Database: new("oa_db"),+ ExcludeTables: []string{"personnel_real_time"},}- args := uc.buildMariadbDumpArgs(database)-- if !slices.Contains(args, "--skip-extended-insert") {- t.Fatalf("expected --skip-extended-insert when extended inserts are disabled, got %v", args)- }-}--func Test_BuildMariadbDumpArgs_WhenExtendedInsertEnabled_OmitsSkipExtendedInsert(t *testing.T) {- uc := &CreateMariadbBackupUsecase{}- database := &mariadbtypes.MariadbDatabase{- Version: tools.MariadbVersion1011,- IsUseExtendedInsert: true,- }-- args := uc.buildMariadbDumpArgs(database)+ dumpArgs := uc.buildMariadbDumpArgs(database)- if slices.Contains(args, "--skip-extended-insert") {- t.Fatalf("expected no --skip-extended-insert when extended inserts are enabled, got %v", args)+ if slices.Contains(dumpArgs, "--skip-extended-insert") {+ t.Fatalf("mariadb-dump args must never contain --skip-extended-insert: %v", dumpArgs)}}diff --git a/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc.go b/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc.goindex 4147cba4..14b26e1c 100644--- a/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc.go+++ b/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc.go@@ -129,13 +129,6 @@ func (uc *CreateMysqlBackupUsecase) buildMysqldumpArgs(my *mysqltypes.MysqlDatab"--verbose",}- // One INSERT per row caps mysqldump memory on huge tables, but bloats the- // dump and makes restores far slower. Opting into extended inserts batches- // rows (mysqldump's default) for fast restores at higher backup memory.- if !my.IsUseExtendedInsert {- args = append(args, "--skip-extended-insert")- }-if my.HasPrivilege("TRIGGER") {args = append(args, "--triggers")}diff --git a/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc_test.go b/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc_test.goindex c56cc629..b9f71970 100644--- a/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc_test.go+++ b/backend/internal/features/backups/backups/usecases/logical/mysql/create_backup_uc_test.go@@ -9,31 +9,21 @@ import ("databasus-backend/internal/util/tools")-func Test_BuildMysqldumpArgs_WhenExtendedInsertDisabled_SkipsExtendedInsert(t *testing.T) {+// One INSERT per row costs ~127x on restore and saves no memory: with --quick the+// dumper streams rows and caps a batched statement at net_buffer_length (~1 MB)+// however large the table is (issue #630).+func Test_BuildMysqldumpArgs_ForAnyDatabase_NeverSkipsExtendedInsert(t *testing.T) {uc := &CreateMysqlBackupUsecase{}database := &mysqltypes.MysqlDatabase{- Version: tools.MysqlVersion80,- IsUseExtendedInsert: false,- }-- args := uc.buildMysqldumpArgs(database)-- if !slices.Contains(args, "--skip-extended-insert") {- t.Fatalf("expected --skip-extended-insert when extended inserts are disabled, got %v", args)- }-}--func Test_BuildMysqldumpArgs_WhenExtendedInsertEnabled_OmitsSkipExtendedInsert(t *testing.T) {- uc := &CreateMysqlBackupUsecase{}- database := &mysqltypes.MysqlDatabase{- Version: tools.MysqlVersion80,- IsUseExtendedInsert: true,+ Version: tools.MysqlVersion80,+ Database: new("oa_db"),+ ExcludeTables: []string{"personnel_real_time"},}- args := uc.buildMysqldumpArgs(database)+ dumpArgs := uc.buildMysqldumpArgs(database)- if slices.Contains(args, "--skip-extended-insert") {- t.Fatalf("expected no --skip-extended-insert when extended inserts are enabled, got %v", args)+ if slices.Contains(dumpArgs, "--skip-extended-insert") {+ t.Fatalf("mysqldump args must never contain --skip-extended-insert: %v", dumpArgs)}}diff --git a/backend/internal/features/databases/databases/mariadb/model.go b/backend/internal/features/databases/databases/mariadb/model.goindex 1de6c5ac..129612d9 100644--- a/backend/internal/features/databases/databases/mariadb/model.go+++ b/backend/internal/features/databases/databases/mariadb/model.go@@ -34,7 +34,6 @@ type MariadbDatabase struct {Database *string `json:"database" gorm:"type:text"`IsHttps bool `json:"isHttps" gorm:"type:boolean;default:false"`IsExcludeEvents bool `json:"isExcludeEvents" gorm:"type:boolean;default:false"`- IsUseExtendedInsert bool `json:"isUseExtendedInsert" gorm:"column:is_use_extended_insert;type:boolean;not null;default:false"`IsSkipGaleraDisable bool `json:"isSkipGaleraDisable" gorm:"column:is_skip_galera_disable;type:boolean;not null;default:false"`ExcludeTables []string `json:"excludeTables" gorm:"-"`ExcludeTablesString string `json:"-" gorm:"column:exclude_tables;type:text;not null;default:''"`@@ -187,7 +186,6 @@ func (m *MariadbDatabase) Update(incoming *MariadbDatabase) {m.Database = incoming.Databasem.IsHttps = incoming.IsHttpsm.IsExcludeEvents = incoming.IsExcludeEvents- m.IsUseExtendedInsert = incoming.IsUseExtendedInsertm.IsSkipGaleraDisable = incoming.IsSkipGaleraDisablem.ExcludeTables = incoming.ExcludeTablesm.Privileges = incoming.Privilegesdiff --git a/backend/internal/features/databases/databases/mysql/model.go b/backend/internal/features/databases/databases/mysql/model.goindex 295f1cf8..5d07b95a 100644--- a/backend/internal/features/databases/databases/mysql/model.go+++ b/backend/internal/features/databases/databases/mysql/model.go@@ -27,16 +27,15 @@ type MysqlDatabase struct {Version tools.MysqlVersion `json:"version" gorm:"type:text;not null"`- Host string `json:"host" gorm:"type:text;not null"`- Port int `json:"port" gorm:"type:int;not null"`- Username string `json:"username" gorm:"type:text;not null"`- Password string `json:"password" gorm:"type:text;not null"`- Database *string `json:"database" gorm:"type:text"`- IsHttps bool `json:"isHttps" gorm:"type:boolean;default:false"`- ExcludeTables []string `json:"excludeTables" gorm:"-"`- ExcludeTablesString string `json:"-" gorm:"column:exclude_tables;type:text;not null;default:''"`- Privileges string `json:"privileges" gorm:"column:privileges;type:text;not null;default:''"`- IsUseExtendedInsert bool `json:"isUseExtendedInsert" gorm:"column:is_use_extended_insert;type:boolean;not null;default:false"`+ Host string `json:"host" gorm:"type:text;not null"`+ Port int `json:"port" gorm:"type:int;not null"`+ Username string `json:"username" gorm:"type:text;not null"`+ Password string `json:"password" gorm:"type:text;not null"`+ Database *string `json:"database" gorm:"type:text"`+ IsHttps bool `json:"isHttps" gorm:"type:boolean;default:false"`+ ExcludeTables []string `json:"excludeTables" gorm:"-"`+ ExcludeTablesString string `json:"-" gorm:"column:exclude_tables;type:text;not null;default:''"`+ Privileges string `json:"privileges" gorm:"column:privileges;type:text;not null;default:''"`}func (m *MysqlDatabase) TableName() string {@@ -186,7 +185,6 @@ func (m *MysqlDatabase) Update(incoming *MysqlDatabase) {m.IsHttps = incoming.IsHttpsm.ExcludeTables = incoming.ExcludeTablesm.Privileges = incoming.Privileges- m.IsUseExtendedInsert = incoming.IsUseExtendedInsertif incoming.Password != "" {m.Password = incoming.Passworddiff --git a/backend/migrations/20260811175124_drop_is_use_extended_insert_from_mysql_and_mariadb.sql b/backend/migrations/20260811175124_drop_is_use_extended_insert_from_mysql_and_mariadb.sqlnew file mode 100644index 00000000..35dd4e88--- /dev/null+++ b/backend/migrations/20260811175124_drop_is_use_extended_insert_from_mysql_and_mariadb.sql@@ -0,0 +1,17 @@+-- +goose Up+-- +goose StatementBegin+ALTER TABLE mysql_databases+ DROP COLUMN IF EXISTS is_use_extended_insert;++ALTER TABLE mariadb_databases+ DROP COLUMN IF EXISTS is_use_extended_insert;+-- +goose StatementEnd++-- +goose Down+-- +goose StatementBegin+ALTER TABLE mysql_databases+ ADD COLUMN IF NOT EXISTS is_use_extended_insert BOOLEAN NOT NULL DEFAULT FALSE;++ALTER TABLE mariadb_databases+ ADD COLUMN IF NOT EXISTS is_use_extended_insert BOOLEAN NOT NULL DEFAULT FALSE;+-- +goose StatementEnddiff --git a/frontend/src/entity/databases/model/mariadb/MariadbDatabase.ts b/frontend/src/entity/databases/model/mariadb/MariadbDatabase.tsindex 2fd3a2a1..441efda6 100644--- a/frontend/src/entity/databases/model/mariadb/MariadbDatabase.ts+++ b/frontend/src/entity/databases/model/mariadb/MariadbDatabase.ts@@ -10,7 +10,6 @@ export interface MariadbDatabase {database?: string;isHttps: boolean;isExcludeEvents?: boolean;- isUseExtendedInsert?: boolean;isSkipGaleraDisable?: boolean;excludeTables?: string[];}diff --git a/frontend/src/entity/databases/model/mysql/MysqlDatabase.ts b/frontend/src/entity/databases/model/mysql/MysqlDatabase.tsindex 854ff3e6..052217e7 100644--- a/frontend/src/entity/databases/model/mysql/MysqlDatabase.ts+++ b/frontend/src/entity/databases/model/mysql/MysqlDatabase.ts@@ -10,6 +10,5 @@ export interface MysqlDatabase {password: string;database?: string;isHttps: boolean;- isUseExtendedInsert?: boolean;excludeTables?: string[];}diff --git a/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsxindex 6c991b57..e3616ee8 100644--- a/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx+++ b/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx@@ -50,7 +50,6 @@ export const EditMariaDbSpecificDataComponent = ({const hasAdvancedValues =!!database.mariadb?.isExcludeEvents ||- !!database.mariadb?.isUseExtendedInsert ||!!database.mariadb?.isSkipGaleraDisable ||!!database.mariadb?.excludeTables?.length;const [isShowAdvanced, setShowAdvanced] = useState(hasAdvancedValues);@@ -381,35 +380,6 @@ export const EditMariaDbSpecificDataComponent = ({</div></div>- <div className="mb-1 flex w-full items-center">- <div className="min-w-[150px]">Use extended inserts</div>- <div className="flex items-center">- <Checkbox- checked={editingDatabase.mariadb?.isUseExtendedInsert || false}- onChange={(e) => {- if (!editingDatabase.mariadb) return;-- setEditingDatabase({- ...editingDatabase,- mariadb: {- ...editingDatabase.mariadb,- isUseExtendedInsert: e.target.checked,- },- });- }}- >- Enable extended inserts- </Checkbox>-- <Tooltip- className="cursor-pointer"- title="Batch multiple rows per INSERT for much faster restores. Off by default because it uses more memory during backup - enable only if restores are slow and your server has enough memory."- >- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />- </Tooltip>- </div>- </div>-<div className="mb-1 flex w-full items-center"><div className="min-w-[150px]">Galera replication</div><div className="flex items-center">diff --git a/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsxindex 31026160..3ff58a1a 100644--- a/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx+++ b/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx@@ -1,5 +1,5 @@import { CopyOutlined, DownOutlined, InfoCircleOutlined, UpOutlined } from '@ant-design/icons';-import { App, Button, Checkbox, Input, InputNumber, Select, Switch, Tooltip } from 'antd';+import { App, Button, Input, InputNumber, Select, Switch, Tooltip } from 'antd';import { useEffect, useState } from 'react';import { type Database, databaseApi } from '../../../../entity/databases';@@ -48,8 +48,7 @@ export const EditMySqlSpecificDataComponent = ({const [isTestingConnection, setIsTestingConnection] = useState(false);const [isConnectionFailed, setIsConnectionFailed] = useState(false);- const hasAdvancedValues =- !!database.mysql?.isUseExtendedInsert || !!database.mysql?.excludeTables?.length;+ const hasAdvancedValues = !!database.mysql?.excludeTables?.length;const [isShowAdvanced, setShowAdvanced] = useState(hasAdvancedValues);const [isShowPasteModal, setIsShowPasteModal] = useState(false);@@ -349,35 +348,6 @@ export const EditMySqlSpecificDataComponent = ({{isShowAdvanced && (<>- <div className="mb-1 flex w-full items-center">- <div className="min-w-[150px]">Use extended inserts</div>- <div className="flex items-center">- <Checkbox- checked={editingDatabase.mysql?.isUseExtendedInsert || false}- onChange={(e) => {- if (!editingDatabase.mysql) return;-- setEditingDatabase({- ...editingDatabase,- mysql: {- ...editingDatabase.mysql,- isUseExtendedInsert: e.target.checked,- },- });- }}- >- Enable extended inserts- </Checkbox>-- <Tooltip- className="cursor-pointer"- title="Batch multiple rows per INSERT for much faster restores. Off by default because it uses more memory during backup - enable only if restores are slow and your server has enough memory."- >- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />- </Tooltip>- </div>- </div>-<div className="mb-1 flex w-full items-center"><div className="min-w-[150px]">Exclude tables</div><Selectdiff --git a/frontend/src/features/databases/ui/show/ShowMariaDbSpecificDataComponent.tsx b/frontend/src/features/databases/ui/show/ShowMariaDbSpecificDataComponent.tsxindex caa78b03..ed0ba26c 100644--- a/frontend/src/features/databases/ui/show/ShowMariaDbSpecificDataComponent.tsx+++ b/frontend/src/features/databases/ui/show/ShowMariaDbSpecificDataComponent.tsx@@ -63,13 +63,6 @@ export const ShowMariaDbSpecificDataComponent = ({ database }: Props) => {</div>)}- {database.mariadb?.isUseExtendedInsert && (- <div className="mb-1 flex w-full items-center">- <div className="min-w-[150px]">Use extended inserts</div>- <div>Yes</div>- </div>- )}-{database.mariadb?.isSkipGaleraDisable && (<div className="mb-1 flex w-full items-center"><div className="min-w-[150px]">Galera replication</div>diff --git a/frontend/src/features/databases/ui/show/ShowMySqlSpecificDataComponent.tsx b/frontend/src/features/databases/ui/show/ShowMySqlSpecificDataComponent.tsxindex 05260978..676d3216 100644--- a/frontend/src/features/databases/ui/show/ShowMySqlSpecificDataComponent.tsx+++ b/frontend/src/features/databases/ui/show/ShowMySqlSpecificDataComponent.tsx@@ -48,13 +48,6 @@ export const ShowMySqlSpecificDataComponent = ({ database }: Props) => {<div>{database.mysql?.isHttps ? 'Yes' : 'No'}</div></div>- {database.mysql?.isUseExtendedInsert && (- <div className="mb-1 flex w-full items-center">- <div className="min-w-[150px]">Use extended inserts</div>- <div>Yes</div>- </div>- )}-{!!database.mysql?.excludeTables?.length && (<div className="mb-1 flex w-full items-center"><div className="min-w-[150px]">Exclude tables</div>