odoo-devops-tools 1.23.0__tar.gz → 1.23.2__tar.gz

{odoo_devops_tools-1.23.0 → odoo_devops_tools-1.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.23.0
+Version: 1.23.2
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -120,7 +120,7 @@ Choose the workflow that fits your environment. Both use the same `odoo-project.
 Create a new workspace:
 
 ```bash
-odoo-compose --init-project ./odoo19
+odoo-compose --init ./odoo19
 ```
 
 Start the Docker Compose environment:
@@ -238,6 +238,7 @@ On Unix-like systems:
 docker/local/scripts/
 ├── backup-db.sh
 ├── restore-db.sh
+├── neutralize-db.sh
 ├── backup-filestore.sh
 ├── restore-filestore.sh
 ├── restic.sh
@@ -281,6 +282,21 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
+Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+After `pg_restore`, Odoo database identity parameters are regenerated so the restored
+database can coexist with the source database:
+
+```bash
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/pre-upgrade.dump
+```
+
+Use `--move` only when the restored database replaces the original database and its
+identity must be preserved:
+
+```bash
+./docker/local/scripts/restore-db.sh --move ./odoo-backups/pre-upgrade.dump
+```
+
 If the target database already exists, the restore is rejected unless `--force` is used. With `--force`, the existing database is dropped and recreated before the dump is restored. When restoring the database currently used by the Odoo service, stop Odoo first and start it again after the restore:
 
 ```bash
@@ -295,7 +311,37 @@ To restore the same dump into another database without replacing the default dat
 ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.3.3. Filestore backup
+#### 1.3.3. Database neutralization
+
+For development or test databases restored from production, run the generated neutralization helper explicitly:
+
+```bash
+./docker/local/scripts/neutralize-db.sh
+```
+
+Override the target database with `ODOO_DB_NAME` when needed:
+
+```bash
+ODOO_DB_NAME=odoo_test ./docker/local/scripts/neutralize-db.sh
+```
+
+For Odoo 16.0 and newer, the helper uses Odoo's native database neutralization mechanism. This applies the `neutralize.sql` scripts provided by installed Odoo modules, disabling or redirecting production-side effects such as scheduled actions, outgoing email, and supported external integrations.
+
+For Odoo 13.0 through 15.0, where the native neutralization framework is not available, the helper applies a deliberately minimal compatibility neutralization through the Odoo ORM: it disables scheduled actions, configured outgoing mail servers, and configured incoming mail servers.
+
+Neutralization is intentionally separate from database restore. A typical test/staging restore workflow is therefore:
+
+```bash
+docker compose stop odoo
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/production.dump
+./docker/local/scripts/restore-filestore.sh ./odoo-backups/production-filestore.tar.gz
+./docker/local/scripts/neutralize-db.sh
+docker compose up -d odoo
+```
+
+`--copy` / `--move` and neutralization serve different purposes: copy/move controls restored database identity, while neutralization controls production side effects.
+
+#### 1.3.4. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -326,7 +372,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.3.4. Filestore restore
+#### 1.3.5. Filestore restore
 
 Restore a filestore archive:
 
@@ -350,7 +396,7 @@ ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-filestore.sh ./odoo-bac
 
 Database and filestore backups are intentionally separate. This allows either part to be restored independently while still making it possible to create matching database and filestore backups when both are needed.
 
-#### 1.3.5. Restic filestore backup
+#### 1.3.6. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -398,7 +444,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.3.6. Restic filestore restore
+#### 1.3.7. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -468,7 +514,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose --init-project ./odoo19 --sync-all --create-venv \
+odoo-compose --init ./odoo19 --sync-all --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -906,7 +952,7 @@ The merged project file is saved as `ROOT/odoo-project.ini`, replacing any exist
 ### Paths and outputs
 
 - `--root ROOT` — workspace root directory. Default: the directory containing a local INI file, or the current working directory for a remote INI or omitted INI. In include mode, the default is the directory of the first local source, or the current working directory when the first source is remote.
-- `--init-project [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init-project ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init-project ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
+- `--init [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
 - `--include INI`, `-i INI` — include an additional project INI layer; can be repeated. Later layers override earlier layers.
 - `--extra-var KEY=VALUE`, `-e KEY=VALUE` — override or inject a value in the optional `[vars]` section; can be repeated.
 - `--set SECTION:KEY=VALUE`, `-S SECTION:KEY=VALUE` — set or override a supported project option; can be repeated. Missing supported sections/options are created automatically. Structured sections (`[virtualenv]`, `[odoo]`, `[addons.<name>]`, and `[docker]`) accept only documented keys; `[config]` remains open to standard Odoo configuration options except `addons_path`.
@@ -977,7 +1023,7 @@ The following sections are supported:
 
 ### General rules
 
-- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init-project` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
+- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
 - INI interpolation is supported, so values such as `${odoo:version}` can be reused across sections.
 - Multiple INI layers can be composed with `-i/--include`. Later layers override earlier layers; multi-line values are replaced as whole option values, not appended.
 - The optional `[vars]` section is useful for reusable values referenced as `${vars:name}`.

{odoo_devops_tools-1.23.0 → odoo_devops_tools-1.23.2}/README.md

@@ -92,7 +92,7 @@ Choose the workflow that fits your environment. Both use the same `odoo-project.
 Create a new workspace:
 
 ```bash
-odoo-compose --init-project ./odoo19
+odoo-compose --init ./odoo19
 ```
 
 Start the Docker Compose environment:
@@ -210,6 +210,7 @@ On Unix-like systems:
 docker/local/scripts/
 ├── backup-db.sh
 ├── restore-db.sh
+├── neutralize-db.sh
 ├── backup-filestore.sh
 ├── restore-filestore.sh
 ├── restic.sh
@@ -253,6 +254,21 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
+Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+After `pg_restore`, Odoo database identity parameters are regenerated so the restored
+database can coexist with the source database:
+
+```bash
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/pre-upgrade.dump
+```
+
+Use `--move` only when the restored database replaces the original database and its
+identity must be preserved:
+
+```bash
+./docker/local/scripts/restore-db.sh --move ./odoo-backups/pre-upgrade.dump
+```
+
 If the target database already exists, the restore is rejected unless `--force` is used. With `--force`, the existing database is dropped and recreated before the dump is restored. When restoring the database currently used by the Odoo service, stop Odoo first and start it again after the restore:
 
 ```bash
@@ -267,7 +283,37 @@ To restore the same dump into another database without replacing the default dat
 ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.3.3. Filestore backup
+#### 1.3.3. Database neutralization
+
+For development or test databases restored from production, run the generated neutralization helper explicitly:
+
+```bash
+./docker/local/scripts/neutralize-db.sh
+```
+
+Override the target database with `ODOO_DB_NAME` when needed:
+
+```bash
+ODOO_DB_NAME=odoo_test ./docker/local/scripts/neutralize-db.sh
+```
+
+For Odoo 16.0 and newer, the helper uses Odoo's native database neutralization mechanism. This applies the `neutralize.sql` scripts provided by installed Odoo modules, disabling or redirecting production-side effects such as scheduled actions, outgoing email, and supported external integrations.
+
+For Odoo 13.0 through 15.0, where the native neutralization framework is not available, the helper applies a deliberately minimal compatibility neutralization through the Odoo ORM: it disables scheduled actions, configured outgoing mail servers, and configured incoming mail servers.
+
+Neutralization is intentionally separate from database restore. A typical test/staging restore workflow is therefore:
+
+```bash
+docker compose stop odoo
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/production.dump
+./docker/local/scripts/restore-filestore.sh ./odoo-backups/production-filestore.tar.gz
+./docker/local/scripts/neutralize-db.sh
+docker compose up -d odoo
+```
+
+`--copy` / `--move` and neutralization serve different purposes: copy/move controls restored database identity, while neutralization controls production side effects.
+
+#### 1.3.4. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -298,7 +344,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.3.4. Filestore restore
+#### 1.3.5. Filestore restore
 
 Restore a filestore archive:
 
@@ -322,7 +368,7 @@ ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-filestore.sh ./odoo-bac
 
 Database and filestore backups are intentionally separate. This allows either part to be restored independently while still making it possible to create matching database and filestore backups when both are needed.
 
-#### 1.3.5. Restic filestore backup
+#### 1.3.6. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -370,7 +416,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.3.6. Restic filestore restore
+#### 1.3.7. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -440,7 +486,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose --init-project ./odoo19 --sync-all --create-venv \
+odoo-compose --init ./odoo19 --sync-all --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -878,7 +924,7 @@ The merged project file is saved as `ROOT/odoo-project.ini`, replacing any exist
 ### Paths and outputs
 
 - `--root ROOT` — workspace root directory. Default: the directory containing a local INI file, or the current working directory for a remote INI or omitted INI. In include mode, the default is the directory of the first local source, or the current working directory when the first source is remote.
-- `--init-project [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init-project ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init-project ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
+- `--init [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
 - `--include INI`, `-i INI` — include an additional project INI layer; can be repeated. Later layers override earlier layers.
 - `--extra-var KEY=VALUE`, `-e KEY=VALUE` — override or inject a value in the optional `[vars]` section; can be repeated.
 - `--set SECTION:KEY=VALUE`, `-S SECTION:KEY=VALUE` — set or override a supported project option; can be repeated. Missing supported sections/options are created automatically. Structured sections (`[virtualenv]`, `[odoo]`, `[addons.<name>]`, and `[docker]`) accept only documented keys; `[config]` remains open to standard Odoo configuration options except `addons_path`.
@@ -949,7 +995,7 @@ The following sections are supported:
 
 ### General rules
 
-- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init-project` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
+- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
 - INI interpolation is supported, so values such as `${odoo:version}` can be reused across sections.
 - Multiple INI layers can be composed with `-i/--include`. Later layers override earlier layers; multi-line values are replaced as whole option values, not appended.
 - The optional `[vars]` section is useful for reusable values referenced as `${vars:name}`.

odoo_devops_tools-1.23.2/odoo_devops_tools/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.23.2"

{odoo_devops_tools-1.23.0 → odoo_devops_tools-1.23.2}/odoo_devops_tools/env.py

@@ -3024,10 +3024,11 @@ ROOT_DIR="$(cd "${{SCRIPT_DIR}}/../../.." && pwd)"
 DEFAULT_DB_NAME={default_db_name}
 DB_NAME="${{ODOO_DB_NAME:-${{DEFAULT_DB_NAME}}}}"
 FORCE=false
+RESTORE_MODE=copy
 SOURCE=""
 
 usage() {{
-  echo "Usage: $(basename "$0") [--force] BACKUP.dump" >&2
+  echo "Usage: $(basename "$0") [--force] [--copy|--move] BACKUP.dump" >&2
 }}
 
 while [[ $# -gt 0 ]]; do
@@ -3035,6 +3036,12 @@ while [[ $# -gt 0 ]]; do
     --force)
       FORCE=true
       ;;
+    --copy)
+      RESTORE_MODE=copy
+      ;;
+    --move)
+      RESTORE_MODE=move
+      ;;
     -*)
       echo "ERROR: unknown option: $1" >&2
       usage
@@ -3086,11 +3093,86 @@ docker compose exec -T db \
   pg_restore --exit-on-error --no-owner --no-acl -U odoo -d "${{DB_NAME}}" \
   < "${{SOURCE}}"
 
+if [[ "${{RESTORE_MODE}}" == "copy" ]]; then
+  echo "INFO: Resetting copied Odoo database identity for '${{DB_NAME}}'."
+  printf '%s\n' 'env["ir.config_parameter"].init(force=True)' | \
+    docker compose run --rm --no-deps -T \
+      --entrypoint click-odoo odoo \
+      -c /etc/odoo/odoo.conf \
+      -d "${{DB_NAME}}" \
+      --log-level=error
+
+  docker compose exec -T db \
+    psql -v ON_ERROR_STOP=1 -U odoo -d "${{DB_NAME}}" <<'SQL'
+DELETE FROM ir_config_parameter
+WHERE key = 'database.enterprise_code';
+
+UPDATE ir_config_parameter
+SET value = 'copy'
+WHERE key = 'database.expiration_reason'
+  AND value != 'demo';
+
+UPDATE ir_config_parameter
+SET value = CURRENT_DATE + INTERVAL '2 month'
+WHERE key = 'database.expiration_date';
+SQL
+else
+  echo "INFO: Preserving Odoo database identity (--move)."
+fi
+
 echo "INFO: Database restore completed: ${{DB_NAME}}"
 """
     return _write_docker_local_script(layout, "restore-db", content)
 
 
+def write_docker_neutralize_db_sh(layout: Layout, cfg: ProjectConfig) -> Path:
+    default_db_name = shlex.quote(_docker_default_db_name(cfg))
+    odoo_major_version = _parse_odoo_version(cfg.odoo.version)
+    if odoo_major_version >= 16:
+        neutralize_command = rf"""
+echo "INFO: Using native Odoo neutralization for Odoo {odoo_major_version}. "
+docker compose run --rm --no-deps -T \
+  --entrypoint odoo odoo \
+  neutralize \
+  -c /etc/odoo/odoo.conf \
+  -d "${{DB_NAME}}"
+"""
+    else:
+        neutralize_command = rf"""
+echo "INFO: Using legacy minimal neutralization for Odoo {odoo_major_version}."
+printf '%s\n' \
+  '[(model.search([("active", "=", True)]).write({{"active": False}})) for model_name in ("ir.cron", "ir.mail_server", "fetchmail.server") if model_name in env for model in (env[model_name],) if "active" in model._fields]; env.cr.commit()' | \
+  docker compose run --rm --no-deps -T \
+    --entrypoint click-odoo odoo \
+    -c /etc/odoo/odoo.conf \
+    -d "${{DB_NAME}}" \
+    --log-level=error
+"""
+
+    content = fr"""#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${{BASH_SOURCE[0]}}")" && pwd)"
+ROOT_DIR="$(cd "${{SCRIPT_DIR}}/../../.." && pwd)"
+DEFAULT_DB_NAME={default_db_name}
+DB_NAME="${{ODOO_DB_NAME:-${{DEFAULT_DB_NAME}}}}"
+
+cd "${{ROOT_DIR}}"
+
+DATABASES="$(docker compose exec -T db \
+  psql -U odoo -d postgres -Atqc "SELECT datname FROM pg_database")"
+if ! grep -Fxq "${{DB_NAME}}" <<< "${{DATABASES}}"; then
+  echo "ERROR: target database '${{DB_NAME}}' does not exist." >&2
+  exit 1
+fi
+
+echo "INFO: Neutralizing Odoo database '${{DB_NAME}}'."
+{neutralize_command}
+echo "INFO: Database neutralization completed: ${{DB_NAME}}"
+"""
+    return _write_docker_local_script(layout, "neutralize-db", content)
+
+
 def write_docker_backup_filestore_sh(layout: Layout, cfg: ProjectConfig) -> Path:
     default_db_name = shlex.quote(_docker_default_db_name(cfg))
     content = fr"""#!/usr/bin/env bash
@@ -3446,6 +3528,7 @@ if defined ODOO_DB_NAME (
   set "DB_NAME=%DEFAULT_DB_NAME%"
 )
 set "FORCE=false"
+set "RESTORE_MODE=copy"
 set "SOURCE="
 
 goto parse_args
@@ -3453,6 +3536,8 @@ goto parse_args
 :parse_args
 if "%~1"=="" goto args_done
 if /i "%~1"=="--force" goto force_arg
+if /i "%~1"=="--copy" goto copy_arg
+if /i "%~1"=="--move" goto move_arg
 if "%~1:~0,1%"=="-" goto unknown_option
 if defined SOURCE goto usage_error
 set "SOURCE=%~1"
@@ -3464,6 +3549,16 @@ set "FORCE=true"
 shift
 goto parse_args
 
+:copy_arg
+set "RESTORE_MODE=copy"
+shift
+goto parse_args
+
+:move_arg
+set "RESTORE_MODE=move"
+shift
+goto parse_args
+
 :args_done
 if not defined SOURCE goto usage_error
 if not exist "%SOURCE%" (
@@ -3495,6 +3590,18 @@ if errorlevel 1 exit /b 1
 docker compose exec -T db pg_restore --exit-on-error --no-owner --no-acl -U odoo -d "%DB_NAME%" < "%SOURCE%"
 if errorlevel 1 exit /b 1
 
+if /i "%RESTORE_MODE%"=="move" goto restore_done
+
+echo INFO: Resetting copied Odoo database identity for '%DB_NAME%'.
+echo env["ir.config_parameter"].init(force=True^) | docker compose run --rm --no-deps -T --entrypoint click-odoo odoo -c /etc/odoo/odoo.conf -d "%DB_NAME%" --log-level=error
+if errorlevel 1 exit /b 1
+
+docker compose exec -T db psql -v ON_ERROR_STOP=1 -U odoo -d "%DB_NAME%" -c "DELETE FROM ir_config_parameter WHERE key = 'database.enterprise_code'; UPDATE ir_config_parameter SET value = 'copy' WHERE key = 'database.expiration_reason' AND value != 'demo'; UPDATE ir_config_parameter SET value = CURRENT_DATE + INTERVAL '2 month' WHERE key = 'database.expiration_date';"
+if errorlevel 1 exit /b 1
+goto restore_done
+
+:restore_done
+if /i "%RESTORE_MODE%"=="move" echo INFO: Preserving Odoo database identity (--move).
 echo INFO: Database restore completed: %DB_NAME%
 endlocal
 exit /b 0
@@ -3504,12 +3611,60 @@ echo ERROR: unknown option: %~1
 goto usage_error
 
 :usage_error
-echo Usage: %~nx0 [--force] BACKUP.dump
+echo Usage: %~nx0 [--force] [--copy^|--move] BACKUP.dump
 exit /b 2
 """
     return _write_docker_local_script(layout, "restore-db", content, ext="bat")
 
 
+def write_docker_neutralize_db_bat(layout: Layout, cfg: ProjectConfig) -> Path:
+    default_db_name = _docker_default_db_name(cfg).replace("%", "%%")
+    odoo_major_version = _parse_odoo_version(cfg.odoo.version)
+    if odoo_major_version >= 16:
+        neutralize_command = rf"""echo INFO: Using native Odoo neutralization for Odoo {odoo_major_version}.
+docker compose run --rm --no-deps -T --entrypoint odoo odoo neutralize -c /etc/odoo/odoo.conf -d "%DB_NAME%"
+if errorlevel 1 exit /b 1
+"""
+    else:
+        neutralize_command = rf"""echo INFO: Using legacy minimal neutralization for Odoo {odoo_major_version}.
+echo [(model.search([("active", "=", True)]).write({{"active": False}})) for model_name in ("ir.cron", "ir.mail_server", "fetchmail.server") if model_name in env for model in (env[model_name],) if "active" in model._fields]; env.cr.commit() | docker compose run --rm --no-deps -T --entrypoint click-odoo odoo -c /etc/odoo/odoo.conf -d "%DB_NAME%" --log-level=error
+if errorlevel 1 exit /b 1
+"""
+
+    content = rf"""@echo off
+setlocal
+
+set "SCRIPT_DIR=%~dp0"
+if "%SCRIPT_DIR:~-1%"=="\" set "SCRIPT_DIR=%SCRIPT_DIR:~0,-1%"
+for %%I in ("%SCRIPT_DIR%\..\..\..") do set "ROOT_DIR=%%~fI"
+set "DEFAULT_DB_NAME={default_db_name}"
+if defined ODOO_DB_NAME (
+  set "DB_NAME=%ODOO_DB_NAME%"
+) else (
+  set "DB_NAME=%DEFAULT_DB_NAME%"
+)
+
+cd /d "%ROOT_DIR%" || exit /b 1
+
+set "DB_EXISTS=false"
+for /f "usebackq delims=" %%D in (`docker compose exec -T db psql -U odoo -d postgres -Atqc "SELECT datname FROM pg_database"`) do (
+  if "%%D"=="%DB_NAME%" set "DB_EXISTS=true"
+)
+
+if not "%DB_EXISTS%"=="true" (
+  echo ERROR: target database '%DB_NAME%' does not exist.
+  exit /b 1
+)
+
+echo INFO: Neutralizing Odoo database '%DB_NAME%'.
+{neutralize_command}
+echo INFO: Database neutralization completed: %DB_NAME%
+endlocal
+exit /b 0
+"""
+    return _write_docker_local_script(layout, "neutralize-db", content, ext="bat")
+
+
 def write_docker_backup_filestore_bat(layout: Layout, cfg: ProjectConfig) -> Path:
     default_db_name = _docker_default_db_name(cfg).replace("%", "%%")
     content = rf"""@echo off
@@ -3874,6 +4029,7 @@ def write_docker_local_scripts(layout: Layout, cfg: ProjectConfig) -> dict[str,
         return {
             "backup_db": write_docker_backup_db_bat(layout, cfg),
             "restore_db": write_docker_restore_db_bat(layout, cfg),
+            "neutralize_db": write_docker_neutralize_db_bat(layout, cfg),
             "backup_filestore": write_docker_backup_filestore_bat(layout, cfg),
             "restore_filestore": write_docker_restore_filestore_bat(layout, cfg),
             "restic": write_docker_restic_bat(layout),
@@ -3884,6 +4040,7 @@ def write_docker_local_scripts(layout: Layout, cfg: ProjectConfig) -> dict[str,
     return {
         "backup_db": write_docker_backup_db_sh(layout, cfg),
         "restore_db": write_docker_restore_db_sh(layout, cfg),
+        "neutralize_db": write_docker_neutralize_db_sh(layout, cfg),
         "backup_filestore": write_docker_backup_filestore_sh(layout, cfg),
         "restore_filestore": write_docker_restore_filestore_sh(layout, cfg),
         "restic": write_docker_restic_sh(layout),
@@ -6090,11 +6247,11 @@ def build_parser() -> argparse.ArgumentParser:
 Examples:
 
   Creating a workspace:
-    odoo-compose --init-project ./odoo18-workspace --sync-all --create-venv \\
+    odoo-compose --init ./odoo18-workspace --sync-all --create-venv \\
       --set odoo:version=18.0
 
   Creating a workspace with explicit database settings:
-    odoo-compose --init-project ./odoo18-workspace --sync-all --create-venv \\
+    odoo-compose --init ./odoo18-workspace --sync-all --create-venv \\
       --set odoo:version=18.0 \\
       --set config:db_host=127.0.0.1 \\
       --set config:db_name=odoo \\
@@ -6111,7 +6268,7 @@ Examples:
     odoo-compose git+https://github.com/lck/odoo-devops-tools.git//examples/odoo18-minimal.ini?ref=main --sync-all --create-venv
 
   Preparing local Docker development:
-    odoo-compose --init-project ./odoo19 --sync-addons
+    odoo-compose --init ./odoo19 --sync-addons
 
   Generating a deploy Docker build context:
     odoo-compose /path/to/odoo-project.ini --sync-addons --create-docker-deploy
@@ -6179,7 +6336,9 @@ Examples:
     )
 
     parser.add_argument(
+        "--init",
         "--init-project",
+        dest="init_project",
         nargs="?",
         const="",
         default=None,
@@ -6188,7 +6347,7 @@ Examples:
             "Create ROOT/odoo-project.ini from the bundled default template if it does not already exist. "
             "An optional ROOT can be supplied directly as shorthand for --root. "
             "If ROOT is supplied here, --root must not also be used. "
-            "Without --init-project, an existing ROOT/odoo-project.ini is required."
+            "Without --init, an existing ROOT/odoo-project.ini is required."
         ),
     )
 
@@ -6435,12 +6594,12 @@ def main() -> None:
 
     if init_project_root_raw and args.root:
         parser.error(
-            "workspace ROOT was specified both as --init-project ROOT and --root; "
+            "workspace ROOT was specified both as --init ROOT and --root; "
             "use only one of them."
         )
 
     if bool(getattr(args, 'show_last_run', False)) and init_project:
-        parser.error("--init-project cannot be used together with --show-last-run.")
+        parser.error("--init cannot be used together with --show-last-run.")
     if bool(getattr(args, 'show_last_run', False)) and getattr(args, 'create_from_bundle', None):
         parser.error("--create-from-bundle cannot be used together with --show-last-run.")
     if bool(getattr(args, 'show_last_run', False)) and getattr(args, 'create_bundle', None) is not None:
@@ -6499,7 +6658,7 @@ def main() -> None:
         if getattr(args, 'include_inis', None):
             conflicting_options.append("--include")
         if init_project:
-            conflicting_options.append("--init-project")
+            conflicting_options.append("--init")
         if args.all or args.odoo or args.addons:
             conflicting_options.append("--sync-*")
         if bool(getattr(args, 'create_venv', False)) or create_venv_from_wheelhouse:
@@ -6580,14 +6739,14 @@ def main() -> None:
     project_ini_status: Optional[str] = None
 
     if init_project and not implicit_ini:
-        parser.error("--init-project can only be used when INI is omitted and no -i/--include is provided.")
+        parser.error("--init can only be used when INI is omitted and no -i/--include is provided.")
 
     if implicit_ini:
         if init_project_root_raw:
             root_override = _validate_root_override(
                 parser,
                 init_project_root_raw,
-                option_name="--init-project ROOT",
+                option_name="--init ROOT",
             )
         elif args.root:
             root_override = _validate_root_override(parser, args.root)
@@ -6624,7 +6783,7 @@ def main() -> None:
                     project_ini_status = f"used existing ROOT/{_DEFAULT_PROJECT_INI_NAME}"
                     _logger.info("Project INI already exists, leaving it in place: %s", ini_path)
             elif not ini_path.is_file():
-                suggested_cmd = ["odoo-compose", "--init-project"]
+                suggested_cmd = ["odoo-compose", "--init"]
                 if args.root:
                     suggested_cmd.append(str(root_override))
                 parser.error(

{odoo_devops_tools-1.23.0 → odoo_devops_tools-1.23.2}/odoo_devops_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.23.0
+Version: 1.23.2
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -120,7 +120,7 @@ Choose the workflow that fits your environment. Both use the same `odoo-project.
 Create a new workspace:
 
 ```bash
-odoo-compose --init-project ./odoo19
+odoo-compose --init ./odoo19
 ```
 
 Start the Docker Compose environment:
@@ -238,6 +238,7 @@ On Unix-like systems:
 docker/local/scripts/
 ├── backup-db.sh
 ├── restore-db.sh
+├── neutralize-db.sh
 ├── backup-filestore.sh
 ├── restore-filestore.sh
 ├── restic.sh
@@ -281,6 +282,21 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
+Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+After `pg_restore`, Odoo database identity parameters are regenerated so the restored
+database can coexist with the source database:
+
+```bash
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/pre-upgrade.dump
+```
+
+Use `--move` only when the restored database replaces the original database and its
+identity must be preserved:
+
+```bash
+./docker/local/scripts/restore-db.sh --move ./odoo-backups/pre-upgrade.dump
+```
+
 If the target database already exists, the restore is rejected unless `--force` is used. With `--force`, the existing database is dropped and recreated before the dump is restored. When restoring the database currently used by the Odoo service, stop Odoo first and start it again after the restore:
 
 ```bash
@@ -295,7 +311,37 @@ To restore the same dump into another database without replacing the default dat
 ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.3.3. Filestore backup
+#### 1.3.3. Database neutralization
+
+For development or test databases restored from production, run the generated neutralization helper explicitly:
+
+```bash
+./docker/local/scripts/neutralize-db.sh
+```
+
+Override the target database with `ODOO_DB_NAME` when needed:
+
+```bash
+ODOO_DB_NAME=odoo_test ./docker/local/scripts/neutralize-db.sh
+```
+
+For Odoo 16.0 and newer, the helper uses Odoo's native database neutralization mechanism. This applies the `neutralize.sql` scripts provided by installed Odoo modules, disabling or redirecting production-side effects such as scheduled actions, outgoing email, and supported external integrations.
+
+For Odoo 13.0 through 15.0, where the native neutralization framework is not available, the helper applies a deliberately minimal compatibility neutralization through the Odoo ORM: it disables scheduled actions, configured outgoing mail servers, and configured incoming mail servers.
+
+Neutralization is intentionally separate from database restore. A typical test/staging restore workflow is therefore:
+
+```bash
+docker compose stop odoo
+./docker/local/scripts/restore-db.sh --copy ./odoo-backups/production.dump
+./docker/local/scripts/restore-filestore.sh ./odoo-backups/production-filestore.tar.gz
+./docker/local/scripts/neutralize-db.sh
+docker compose up -d odoo
+```
+
+`--copy` / `--move` and neutralization serve different purposes: copy/move controls restored database identity, while neutralization controls production side effects.
+
+#### 1.3.4. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -326,7 +372,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.3.4. Filestore restore
+#### 1.3.5. Filestore restore
 
 Restore a filestore archive:
 
@@ -350,7 +396,7 @@ ODOO_DB_NAME=odoo_restore ./docker/local/scripts/restore-filestore.sh ./odoo-bac
 
 Database and filestore backups are intentionally separate. This allows either part to be restored independently while still making it possible to create matching database and filestore backups when both are needed.
 
-#### 1.3.5. Restic filestore backup
+#### 1.3.6. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -398,7 +444,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.3.6. Restic filestore restore
+#### 1.3.7. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -468,7 +514,7 @@ In this workflow, Odoo runs directly on the host using a generated Python virtua
 Create the workspace with the Odoo source and virtual environment:
 
 ```bash
-odoo-compose --init-project ./odoo19 --sync-all --create-venv \
+odoo-compose --init ./odoo19 --sync-all --create-venv \
   --set config:db_host=127.0.0.1 \
   --set config:db_name=odoo \
   --set config:db_user=odoo \
@@ -906,7 +952,7 @@ The merged project file is saved as `ROOT/odoo-project.ini`, replacing any exist
 ### Paths and outputs
 
 - `--root ROOT` — workspace root directory. Default: the directory containing a local INI file, or the current working directory for a remote INI or omitted INI. In include mode, the default is the directory of the first local source, or the current working directory when the first source is remote.
-- `--init-project [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init-project ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init-project ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
+- `--init [ROOT]` — create `ROOT/odoo-project.ini` from the bundled default template if it does not already exist. `ROOT` is optional; when supplied, it is a shorthand for selecting the workspace root directly, for example `odoo-compose --init ./odoo19`. When the optional value is omitted, `--root ROOT` remains supported for backward compatibility. Do not supply both `--init ROOT` and `--root ROOT`; the command exits with an error instead of choosing one implicitly. This option is valid only when `INI` is omitted and no `-i/--include` is provided. Existing project files are not overwritten.
 - `--include INI`, `-i INI` — include an additional project INI layer; can be repeated. Later layers override earlier layers.
 - `--extra-var KEY=VALUE`, `-e KEY=VALUE` — override or inject a value in the optional `[vars]` section; can be repeated.
 - `--set SECTION:KEY=VALUE`, `-S SECTION:KEY=VALUE` — set or override a supported project option; can be repeated. Missing supported sections/options are created automatically. Structured sections (`[virtualenv]`, `[odoo]`, `[addons.<name>]`, and `[docker]`) accept only documented keys; `[config]` remains open to standard Odoo configuration options except `addons_path`.
@@ -977,7 +1023,7 @@ The following sections are supported:
 
 ### General rules
 
-- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init-project` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
+- The project file can have any filename when passed explicitly. When `INI` is omitted, `odoo-compose` uses the existing `ROOT/odoo-project.ini`; if it is missing, use `--init` to create it explicitly from the bundled default template. Remote INI sources and merged include layers are materialized as `ROOT/odoo-project.ini`.
 - INI interpolation is supported, so values such as `${odoo:version}` can be reused across sections.
 - Multiple INI layers can be composed with `-i/--include`. Later layers override earlier layers; multi-line values are replaced as whole option values, not appended.
 - The optional `[vars]` section is useful for reusable values referenced as `${vars:name}`.

{odoo_devops_tools-1.23.0 → odoo_devops_tools-1.23.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odoo-devops-tools"
-version = "1.23.0"
+version = "1.23.2"
 description = "Build reproducible Odoo workspaces from a single project definition."
 readme = "README.md"
 license = "MIT"

odoo_devops_tools-1.23.0/odoo_devops_tools/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.23.0"