cli-backup 0.1.0__tar.gz → 0.2.0__tar.gz

{cli_backup-0.1.0/src/cli_backup.egg-info → cli_backup-0.2.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: cli-backup
-Version: 0.1.0
+Version: 0.2.0
 Summary: Host backup CLI for database snapshots and directory archives
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/XakkiDev/cli-backup
 Project-URL: Issues, https://github.com/XakkiDev/cli-backup/issues
-Keywords: backup,mysql,mariadb,sqlite,s3
+Keywords: backup,mysql,mariadb,postgresql,sqlite,s3
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -24,10 +24,10 @@ A Python command-line tool for full database backups and directory archives, sto
 
 | Interface | Sources | Features |
 | --- | --- | --- |
-| `scheduled` and `share.Makefile` | MariaDB, MySQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
+| `scheduled` and `share.Makefile` | MariaDB, MySQL, PostgreSQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
 | Generic commands | MariaDB/MySQL, Redis, directories | Full dumps, Redis RDB snapshots, gzip tar archives and exclusion patterns |
 
-The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. PostgreSQL, MongoDB and incremental backups are not implemented.
+The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. MongoDB and incremental backups are not implemented.
 
 **Protect backup data and credentials.** Backups are not encrypted by this tool. Use private local paths, protected environment files and encrypted transport. Backups are not a substitute for an authorized recovery exercise. This CLI does not create buckets, change lifecycle policies, or schedule jobs.
 
@@ -63,6 +63,8 @@ Set `CLI_BACKUP_PROJECT_NAME` if the storage namespace should differ from the Co
 
 Container mode defaults to root, using `MARIADB_ROOT_PASSWORD` and `MARIADB_DATABASE` from the container; MySQL equivalents are also supported. Set a user and password together to override root. `CLI_BACKUP_DB_NAME` accepts comma-separated database names; each database produces a separate file. Credentials must be supplied in the environment or a protected project file, never as command-line arguments.
 
+For PostgreSQL, set `CLI_BACKUP_DB_SERVICE_NAME=postgresql`. Container mode defaults to `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` from the database container. The container must accept TCP connections on `127.0.0.1:5432` (or the configured port). Host mode requires `pg_dump` and explicit connection settings. Dumps include one database and use PostgreSQL's consistent snapshot; cluster-wide roles and tablespaces are not included. Restore and restore rehearsal are not implemented for PostgreSQL; verify the checksum and perform recovery manually only with authorization.
+
 For SQLite, set `CLI_BACKUP_PROJECT_NAME`, `CLI_BACKUP_DB_SERVICE_NAME=sqlite`, and an absolute `CLI_BACKUP_DB_PATH`. Do not set container, host or Compose variables. The SQLite online backup API includes committed WAL transactions without stopping the writer. Automatic SQLite restoration is not implemented.
 
 ```sh
@@ -74,6 +76,12 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+
+```sh
+make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+```
+
 ### Storage and schedule
 
 Set `CLI_BACKUP_LOCAL_ROOT` for local storage and/or the S3 variables `CLI_BACKUP_S3_BUCKET`, `CLI_BACKUP_S3_ENDPOINT`, `CLI_BACKUP_S3_REGION`, `CLI_BACKUP_S3_KEY`, `CLI_BACKUP_S3_SECRET`, and optionally `CLI_BACKUP_S3_PREFIX`. Project environment values override global environment values; explicit scheduled CLI options override project values. `--project-env` accepts literal assignments and does not execute shell code. Period keys are relative to the optional S3 prefix:

{cli_backup-0.1.0 → cli_backup-0.2.0}/README.md

@@ -8,10 +8,10 @@ A Python command-line tool for full database backups and directory archives, sto
 
 | Interface | Sources | Features |
 | --- | --- | --- |
-| `scheduled` and `share.Makefile` | MariaDB, MySQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
+| `scheduled` and `share.Makefile` | MariaDB, MySQL, PostgreSQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
 | Generic commands | MariaDB/MySQL, Redis, directories | Full dumps, Redis RDB snapshots, gzip tar archives and exclusion patterns |
 
-The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. PostgreSQL, MongoDB and incremental backups are not implemented.
+The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. MongoDB and incremental backups are not implemented.
 
 **Protect backup data and credentials.** Backups are not encrypted by this tool. Use private local paths, protected environment files and encrypted transport. Backups are not a substitute for an authorized recovery exercise. This CLI does not create buckets, change lifecycle policies, or schedule jobs.
 
@@ -47,6 +47,8 @@ Set `CLI_BACKUP_PROJECT_NAME` if the storage namespace should differ from the Co
 
 Container mode defaults to root, using `MARIADB_ROOT_PASSWORD` and `MARIADB_DATABASE` from the container; MySQL equivalents are also supported. Set a user and password together to override root. `CLI_BACKUP_DB_NAME` accepts comma-separated database names; each database produces a separate file. Credentials must be supplied in the environment or a protected project file, never as command-line arguments.
 
+For PostgreSQL, set `CLI_BACKUP_DB_SERVICE_NAME=postgresql`. Container mode defaults to `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` from the database container. The container must accept TCP connections on `127.0.0.1:5432` (or the configured port). Host mode requires `pg_dump` and explicit connection settings. Dumps include one database and use PostgreSQL's consistent snapshot; cluster-wide roles and tablespaces are not included. Restore and restore rehearsal are not implemented for PostgreSQL; verify the checksum and perform recovery manually only with authorization.
+
 For SQLite, set `CLI_BACKUP_PROJECT_NAME`, `CLI_BACKUP_DB_SERVICE_NAME=sqlite`, and an absolute `CLI_BACKUP_DB_PATH`. Do not set container, host or Compose variables. The SQLite online backup API includes committed WAL transactions without stopping the writer. Automatic SQLite restoration is not implemented.
 
 ```sh
@@ -58,6 +60,12 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+
+```sh
+make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+```
+
 ### Storage and schedule
 
 Set `CLI_BACKUP_LOCAL_ROOT` for local storage and/or the S3 variables `CLI_BACKUP_S3_BUCKET`, `CLI_BACKUP_S3_ENDPOINT`, `CLI_BACKUP_S3_REGION`, `CLI_BACKUP_S3_KEY`, `CLI_BACKUP_S3_SECRET`, and optionally `CLI_BACKUP_S3_PREFIX`. Project environment values override global environment values; explicit scheduled CLI options override project values. `--project-env` accepts literal assignments and does not execute shell code. Period keys are relative to the optional S3 prefix:

{cli_backup-0.1.0 → cli_backup-0.2.0}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cli-backup"
-version = "0.1.0"
+version = "0.2.0"
 description = "Host backup CLI for database snapshots and directory archives"
 requires-python = ">=3.11"
 dependencies = ["boto3==1.43.127"]
 license = "MIT"
 readme = "README.md"
-keywords = ["backup", "mysql", "mariadb", "sqlite", "s3"]
+keywords = ["backup", "mysql", "mariadb", "postgresql", "sqlite", "s3"]
 
 [project.urls]
 Homepage = "https://github.com/XakkiDev/cli-backup"

{cli_backup-0.1.0 → cli_backup-0.2.0}/src/cli_backup/scheduled.py

@@ -83,8 +83,8 @@ class Settings:
         if runtime not in ('docker', 'podman'):
             raise ValueError('CLI_BACKUP_CONTAINER_RUNTIME must be docker or podman')
         service = env.get('CLI_BACKUP_DB_SERVICE_NAME', 'mariadb').lower()
-        if service not in ('mariadb', 'mysql', 'sqlite'):
-            raise ValueError('unsupported CLI_BACKUP_DB_SERVICE_NAME; supported: mariadb, mysql, sqlite')
+        if service not in ('mariadb', 'mysql', 'sqlite', 'postgresql'):
+            raise ValueError('unsupported CLI_BACKUP_DB_SERVICE_NAME; supported: mariadb, mysql, sqlite, postgresql')
         if service == 'sqlite':
             if not db_path or not Path(db_path).is_absolute() or container or host or compose:
                 raise ValueError('SQLite requires an absolute CLI_BACKUP_DB_PATH and no container or host')
@@ -97,7 +97,7 @@ class Settings:
                 raise ValueError('invalid CLI_BACKUP_DB_CONTAINER')
             if host and (host.startswith('-') or not re.fullmatch(r'[A-Za-z0-9_.:-]+', host)):
                 raise ValueError('invalid CLI_BACKUP_DB_HOST')
-        port = int(env.get('CLI_BACKUP_DB_PORT', '3306'))
+        port = int(env.get('CLI_BACKUP_DB_PORT', '5432' if service == 'postgresql' else '3306'))
         if not 1 <= port <= 65535:
             raise ValueError('invalid CLI_BACKUP_DB_PORT')
         names = env.get('CLI_BACKUP_DB_NAME', '')
@@ -160,11 +160,33 @@ def container_info(settings: Settings) -> tuple[str, dict[str, str], str]:
     return info[0]['Id'], environment, info[0]['Config']['Image']
 
 
-def connection(settings: Settings) -> tuple[MySQLConfig | None, list[str], str]:
+@dataclass(frozen=True)
+class PostgreSQLConfig:
+    database: str
+    user: str
+    password: str
+    host: str
+    port: int
+    target: str
+    runtime: str
+    cpu_nice: int
+
+
+def connection(settings: Settings) -> tuple[MySQLConfig | PostgreSQLConfig | None, list[str], str]:
     if settings.service == 'sqlite':
         names = databases(settings.names or Path(settings.db_path).stem)
         return None, names, ''
     target, env, image = container_info(settings) if settings.container else ('', {}, '')
+    if settings.service == 'postgresql':
+        names = databases(settings.names or env.get('POSTGRES_DB') or env.get('POSTGRES_USER') or '')
+        user = settings.user or env.get('POSTGRES_USER') or 'postgres'
+        password = settings.password or env.get('POSTGRES_PASSWORD') or ''
+        if not user or user.startswith('-'):
+            raise ValueError('invalid PostgreSQL user')
+        if not password:
+            raise ValueError('database password is missing; set CLI_BACKUP_DB_USER and CLI_BACKUP_DB_PASSWORD')
+        return PostgreSQLConfig(names[0], user, password, settings.host or '127.0.0.1',
+                                settings.port, target, settings.container_runtime, settings.cpu_nice), names, image
     names = databases(settings.names or env.get('MARIADB_DATABASE') or env.get('MYSQL_DATABASE') or '')
     user = settings.user or 'root'
     password = settings.password or env.get('MARIADB_ROOT_PASSWORD') or env.get('MYSQL_ROOT_PASSWORD') or ''
@@ -220,7 +242,35 @@ def capture_gzip(config: MySQLConfig, path: Path) -> None:
         raise
 
 
-def capture_source(settings: Settings, cfg: MySQLConfig | None, name: str, artifact: Path, tmp: Path) -> str | None:
+def capture_postgresql(config: PostgreSQLConfig, name: str, path: Path) -> None:
+    prefix = [config.runtime, 'exec', '-i', '-e', 'PGPASSWORD', config.target] if config.target else []
+    nice = ['nice', '-n', str(config.cpu_nice)] if config.target and config.cpu_nice else []
+    command = prefix + nice + ['pg_dump', '--no-password', '--host', config.host,
+                                '--port', str(config.port), '--username', config.user, '--dbname', name]
+    process = subprocess.Popen(command, env=dict(os.environ, PGPASSWORD=config.password),
+                               stdin=subprocess.DEVNULL, stdout=subprocess.PIPE)
+    assert process.stdout is not None
+    try:
+        size = 0
+        with gzip.open(path, 'xb') as output:
+            while chunk := process.stdout.read(1024 * 1024):
+                output.write(chunk)
+                size += len(chunk)
+        process.stdout.close()
+        if process.wait() != 0 or not size:
+            raise ValueError('PostgreSQL dump failed or is empty')
+    except BaseException:
+        process.kill()
+        process.wait()
+        raise
+
+
+def capture_source(settings: Settings, cfg: MySQLConfig | PostgreSQLConfig | None, name: str, artifact: Path, tmp: Path) -> str | None:
+    if settings.service == 'postgresql':
+        if not isinstance(cfg, PostgreSQLConfig):
+            raise ValueError('missing PostgreSQL connection')
+        capture_postgresql(cfg, name, artifact)
+        return None
     if settings.service != 'sqlite':
         if cfg is None:
             raise ValueError('missing database connection')
@@ -508,6 +558,8 @@ def main(argv=None) -> int:
     parser.add_argument('--storage', choices=('local', 's3'), default='local')
     parser.add_argument('--file')
     parser.add_argument('--database')
+    parser.add_argument('--source-project-name')
+    parser.add_argument('--source-database')
     parser.add_argument('--project-env', type=Path)
     for option in ('project-name', 'compose-project-name', 'db-container', 'db-service-name',
                    'db-host', 'db-port', 'db-name', 'db-user', 'db-path', 'local-root', 's3-bucket', 'cpu-nice', 'container-runtime'):
@@ -523,6 +575,11 @@ def main(argv=None) -> int:
             if value is not None:
                 environment['CLI_BACKUP_' + option.upper()] = value
         settings = Settings.from_env(environment)
+        if (args.source_project_name or args.source_database) and args.action != 'restore':
+            raise ValueError('source project and source database are only supported for restore')
+        source_project = validate_project(args.source_project_name) if args.source_project_name else settings.project
+        if args.source_database and len(databases(args.source_database)) != 1:
+            raise ValueError('source database must be a single database name')
         if args.action == 'config-check':
             print(f'Configuration valid for project {settings.project}')
             return 0
@@ -556,9 +613,10 @@ def main(argv=None) -> int:
             chosen = dict(stores(settings, args.period)).get(args.storage)
             if chosen is None:
                 raise ValueError('storage is not configured')
-            items = list_store(chosen, settings.project, settings.service)
-            if args.database:
-                items = [m for m in items if m.artifact.endswith(backup_suffix(settings, args.database))]
+            items = list_store(chosen, source_project, settings.service)
+            source_database = args.source_database or (args.database if source_project == settings.project else None)
+            if source_database:
+                items = [m for m in items if m.artifact.endswith(backup_suffix(settings, source_database))]
             if args.action == 'list':
                 for item in items:
                     print(f'{item.artifact}\t{item.timestamp}\t{item.size}\t{item.sha256}')
@@ -582,15 +640,17 @@ def main(argv=None) -> int:
             if not match:
                 raise ValueError('invalid scheduled backup filename')
             selected = match.group(1)
-            if names and selected not in names:
+            if source_project == settings.project and not args.source_database and names and selected not in names:
                 raise ValueError('selected database is not configured')
+            if args.source_database and selected != args.source_database:
+                raise ValueError('backup database does not match the selected source database')
             artifact = tmp / manifest.artifact
             get(chosen, manifest, artifact)
             if args.action == 'verify':
                 print('SHA-256 verified')
                 return 0
-            if settings.service == 'sqlite':
-                raise ValueError('SQLite restoration is manual; use the verified backup file')
+            if settings.service in ('sqlite', 'postgresql'):
+                raise ValueError(f'{settings.service} restoration is manual; use the verified backup file')
             plain = tmp / 'restore.sql'
             with gzip.open(artifact, 'rb') as source, plain.open('xb') as output:
                 shutil.copyfileobj(source, output, 1024 * 1024)
@@ -605,9 +665,13 @@ def main(argv=None) -> int:
             else:
                 if not args.file:
                     raise ValueError('--file is required for live restore')
-                if not sys.stdin.isatty() or input(f'Restore {selected} in {settings.project}? Type yes: ') != 'yes':
+                target = args.database or (names[0] if len(names) == 1 else selected)
+                if target not in names:
+                    raise ValueError('restore target database is not configured')
+                prompt = f'Restore {source_project}/{selected} into {settings.project}/{target}? Type yes: '
+                if not sys.stdin.isatty() or input(prompt) != 'yes':
                     raise ValueError('restore not confirmed')
-                database = MySQLConfig(**{**vars(cfg), 'database': selected})
+                database = MySQLConfig(**{**vars(cfg), 'database': target})
                 with plain.open('rb') as source:
                     restore_mysql(database, source)
             return 0

{cli_backup-0.1.0 → cli_backup-0.2.0/src/cli_backup.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: cli-backup
-Version: 0.1.0
+Version: 0.2.0
 Summary: Host backup CLI for database snapshots and directory archives
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/XakkiDev/cli-backup
 Project-URL: Issues, https://github.com/XakkiDev/cli-backup/issues
-Keywords: backup,mysql,mariadb,sqlite,s3
+Keywords: backup,mysql,mariadb,postgresql,sqlite,s3
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -24,10 +24,10 @@ A Python command-line tool for full database backups and directory archives, sto
 
 | Interface | Sources | Features |
 | --- | --- | --- |
-| `scheduled` and `share.Makefile` | MariaDB, MySQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
+| `scheduled` and `share.Makefile` | MariaDB, MySQL, PostgreSQL, SQLite | Date-based daily, weekly and monthly snapshots; Docker or Podman containers, TCP, or SQLite online backup |
 | Generic commands | MariaDB/MySQL, Redis, directories | Full dumps, Redis RDB snapshots, gzip tar archives and exclusion patterns |
 
-The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. PostgreSQL, MongoDB and incremental backups are not implemented.
+The CLI runs on the host, supports rootless Docker and Podman for scheduled database backups, and does not require a separate backup service in a project's Compose file. Scheduled Compose targets are discovered from container labels. MongoDB and incremental backups are not implemented.
 
 **Protect backup data and credentials.** Backups are not encrypted by this tool. Use private local paths, protected environment files and encrypted transport. Backups are not a substitute for an authorized recovery exercise. This CLI does not create buckets, change lifecycle policies, or schedule jobs.
 
@@ -63,6 +63,8 @@ Set `CLI_BACKUP_PROJECT_NAME` if the storage namespace should differ from the Co
 
 Container mode defaults to root, using `MARIADB_ROOT_PASSWORD` and `MARIADB_DATABASE` from the container; MySQL equivalents are also supported. Set a user and password together to override root. `CLI_BACKUP_DB_NAME` accepts comma-separated database names; each database produces a separate file. Credentials must be supplied in the environment or a protected project file, never as command-line arguments.
 
+For PostgreSQL, set `CLI_BACKUP_DB_SERVICE_NAME=postgresql`. Container mode defaults to `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` from the database container. The container must accept TCP connections on `127.0.0.1:5432` (or the configured port). Host mode requires `pg_dump` and explicit connection settings. Dumps include one database and use PostgreSQL's consistent snapshot; cluster-wide roles and tablespaces are not included. Restore and restore rehearsal are not implemented for PostgreSQL; verify the checksum and perform recovery manually only with authorization.
+
 For SQLite, set `CLI_BACKUP_PROJECT_NAME`, `CLI_BACKUP_DB_SERVICE_NAME=sqlite`, and an absolute `CLI_BACKUP_DB_PATH`. Do not set container, host or Compose variables. The SQLite online backup API includes committed WAL transactions without stopping the writer. Automatic SQLite restoration is not implemented.
 
 ```sh
@@ -74,6 +76,12 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+
+```sh
+make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+```
+
 ### Storage and schedule
 
 Set `CLI_BACKUP_LOCAL_ROOT` for local storage and/or the S3 variables `CLI_BACKUP_S3_BUCKET`, `CLI_BACKUP_S3_ENDPOINT`, `CLI_BACKUP_S3_REGION`, `CLI_BACKUP_S3_KEY`, `CLI_BACKUP_S3_SECRET`, and optionally `CLI_BACKUP_S3_PREFIX`. Project environment values override global environment values; explicit scheduled CLI options override project values. `--project-env` accepts literal assignments and does not execute shell code. Period keys are relative to the optional S3 prefix:

{cli_backup-0.1.0 → cli_backup-0.2.0}/src/cli_backup.egg-info/SOURCES.txt

@@ -20,8 +20,10 @@ src/cli_backup.egg-info/top_level.txt
 tests/test_cli.py
 tests/test_config.py
 tests/test_cpu_priority.py
+tests/test_cross_project_restore.py
 tests/test_files.py
 tests/test_mysql.py
+tests/test_postgresql.py
 tests/test_redis.py
 tests/test_rehearsal.py
 tests/test_scheduled.py

cli_backup-0.2.0/tests/test_cross_project_restore.py

@@ -0,0 +1,57 @@
+import contextlib
+import gzip
+import io
+import os
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import patch
+
+from cli_backup.mysql import MySQLConfig
+from cli_backup.scheduled import main
+from cli_backup.storage import LocalStorage, make_manifest
+
+
+class CrossProjectRestoreTests(unittest.TestCase):
+    def test_source_project_and_target_database_are_distinct(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            store = LocalStorage(root / 'daily')
+            artifact = root / 'dump.gz'
+            with gzip.open(artifact, 'wb') as stream:
+                stream.write(b'SELECT 1;')
+            filename = '2026-11-11.student.sql.gz'
+            store.put(artifact, make_manifest(artifact, 'sa-prod', 'mariadb', filename, '2026-11-11T00:00:00+00:00'))
+            cfg = MySQLConfig('exec', 'student_dev', 'root', 'secret', service='container')
+            env = {'CLI_BACKUP_PROJECT_NAME': 'sa-dev', 'CLI_BACKUP_DB_CONTAINER': 'mariadb',
+                   'CLI_BACKUP_LOCAL_ROOT': str(root)}
+            captured = []
+            def fake_restore(database, stream):
+                captured.append((database.database, stream.read()))
+            args = ['restore', '--storage', 's3', '--file', filename,
+                    '--source-project-name', 'sa-prod', '--source-database', 'student']
+            with patch.dict(os.environ, env, clear=True), \
+                 patch('cli_backup.scheduled.connection', return_value=(cfg, ['student_dev'], 'image')), \
+                 patch('cli_backup.scheduled.stores', return_value=[('s3', store)]), \
+                 patch('cli_backup.scheduled.restore_mysql', side_effect=fake_restore), \
+                 patch('sys.stdin.isatty', return_value=True), patch('builtins.input', return_value='yes') as prompt:
+                self.assertEqual(main(args), 0)
+            self.assertEqual(captured, [('student_dev', b'SELECT 1;')])
+            self.assertIn('sa-prod/student into sa-dev/student_dev', prompt.call_args.args[0])
+
+    def test_confirmation_is_required_even_for_cross_project_restore(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp); store = LocalStorage(root / 'daily'); artifact = root / 'dump.gz'
+            with gzip.open(artifact, 'wb') as stream: stream.write(b'SELECT 1;')
+            filename = '2026-11-11.student.sql.gz'
+            store.put(artifact, make_manifest(artifact, 'sa-prod', 'mariadb', filename, '2026-11-11T00:00:00+00:00'))
+            cfg = MySQLConfig('exec', 'student_dev', 'root', 'secret', service='container')
+            env = {'CLI_BACKUP_PROJECT_NAME': 'sa-dev', 'CLI_BACKUP_DB_CONTAINER': 'mariadb', 'CLI_BACKUP_LOCAL_ROOT': str(root)}
+            with patch.dict(os.environ, env, clear=True), patch('cli_backup.scheduled.connection', return_value=(cfg, ['student_dev'], 'image')), \
+                 patch('cli_backup.scheduled.stores', return_value=[('s3', store)]), patch('cli_backup.scheduled.restore_mysql') as restore, \
+                 patch('sys.stdin.isatty', return_value=False), contextlib.redirect_stderr(io.StringIO()):
+                self.assertEqual(main(['restore', '--storage', 's3', '--file', filename, '--source-project-name', 'sa-prod']), 2)
+                restore.assert_not_called()
+
+if __name__ == '__main__':
+    unittest.main()

cli_backup-0.2.0/tests/test_postgresql.py

@@ -0,0 +1,51 @@
+import gzip
+import io
+import subprocess
+import tempfile
+import unittest
+from datetime import datetime
+from pathlib import Path
+from unittest.mock import patch
+
+from cli_backup.scheduled import Settings, PostgreSQLConfig, backup_database, connection, capture_postgresql
+
+
+class PostgreSQLBackupTests(unittest.TestCase):
+    def settings(self, root):
+        return Settings.from_env({'CLI_BACKUP_COMPOSE_PROJECT_NAME': 'a24-service',
+            'CLI_BACKUP_DB_CONTAINER': 'postgres', 'CLI_BACKUP_DB_SERVICE_NAME': 'postgresql',
+            'CLI_BACKUP_LOCAL_ROOT': str(root), 'CLI_BACKUP_PERIOD_MONTHLY': 'false'})
+
+    def test_container_credentials_are_discovered_without_exposing_password(self):
+        with tempfile.TemporaryDirectory() as root:
+            settings = self.settings(root)
+            self.assertEqual(settings.port, 5432)
+            with patch('cli_backup.scheduled.container_info', return_value=('db123', {
+                'POSTGRES_DB': 'a24', 'POSTGRES_USER': 'dbuser', 'POSTGRES_PASSWORD': 'secret'}, 'pg:16')):
+                cfg, names, _ = connection(settings)
+            self.assertEqual(names, ['a24'])
+            fake = unittest.mock.Mock()
+            fake.stdout = io.BytesIO(b'-- valid dump\n')
+            fake.wait.return_value = 0
+            with patch('cli_backup.scheduled.subprocess.Popen', return_value=fake) as popen:
+                backup_database(settings, cfg, 'a24', Path(root), datetime.fromisoformat('2026-11-11T03:00:00+00:00'))
+            args, kwargs = popen.call_args
+            self.assertNotIn('secret', args[0])
+            self.assertEqual(kwargs['env']['PGPASSWORD'], 'secret')
+            self.assertIn('pg_dump', args[0])
+            path = Path(root) / 'daily/a24-service/postgresql/2026-11-11.a24.sql.gz'
+            with gzip.open(path, 'rb') as dump:
+                self.assertEqual(dump.read(), b'-- valid dump\n')
+            self.assertTrue(Path(str(path) + '.json').is_file())
+
+    def test_failed_dump_is_not_accepted(self):
+        cfg = PostgreSQLConfig('db', 'user', 'secret', 'localhost', 5432, '', 'docker', 10)
+        proc = unittest.mock.Mock()
+        proc.stdout = io.BytesIO(b'partial')
+        proc.wait.return_value = 1
+        with tempfile.TemporaryDirectory() as root, patch('cli_backup.scheduled.subprocess.Popen', return_value=proc):
+            with self.assertRaisesRegex(ValueError, 'failed'):
+                capture_postgresql(cfg, 'db', Path(root) / 'out.gz')
+
+if __name__ == '__main__':
+    unittest.main()